From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 20 Jan 2015 22:56:04 +0000 (+0200)
Subject: usb: isp1760: Remove duplicate usb_disabled() check
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1f8d9b9b503070e5450f49e0a341ac3b43d9164d;p=deliverable%2Flinux.git

usb: isp1760: Remove duplicate usb_disabled() check

Both isp1760_register() and isp1761_pci_probe() check whether USB is
disabled by calling usb_disabled(), and bail out with an error if it is.
One check is enough, remove the PCI-specific check.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index c2a94c966350..264be4d21706 100644
--- a/drivers/usb/isp1760/isp1760-if.c
+++ b/drivers/usb/isp1760/isp1760-if.c
@@ -126,9 +126,6 @@ static int isp1761_pci_probe(struct pci_dev *dev,
 	unsigned int devflags = 0;
 	int ret;
 
-	if (usb_disabled())
-		return -ENODEV;
-
 	if (!dev->irq)
 		return -ENODEV;