diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2015-01-20 23:56:04 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-01-27 16:39:47 +0100 |
| commit | 1f8d9b9b503070e5450f49e0a341ac3b43d9164d (patch) | |
| tree | 7290c5824625d0c734171824fd00d0d473027d15 /drivers/usb | |
| parent | usb: isp1760: Make HCD support optional (diff) | |
| download | linux-1f8d9b9b503070e5450f49e0a341ac3b43d9164d.tar.xz linux-1f8d9b9b503070e5450f49e0a341ac3b43d9164d.zip | |
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/isp1760/isp1760-if.c | 3 |
1 files changed, 0 insertions, 3 deletions
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; |