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.pinch...@ideasonboard.com>
---
 drivers/usb/isp1760/isp1760-if.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index c2a94c9..264be4d 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;
 
-- 
2.0.5

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to