diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2015-01-20 23:56:05 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-01-27 16:39:51 +0100 |
| commit | d21daf1e90514cee8e3fb11c8e28acee3fb87edf (patch) | |
| tree | a44d5731b4bf452d65a5710d9f87e97945ce2573 /drivers/usb/isp1760/isp1760-hcd.c | |
| parent | usb: isp1760: Remove duplicate usb_disabled() check (diff) | |
| download | linux-d21daf1e90514cee8e3fb11c8e28acee3fb87edf.tar.xz linux-d21daf1e90514cee8e3fb11c8e28acee3fb87edf.zip | |
usb: isp1760: Fix USB disabled check
The isp1760 driver registration function returns an error if USB is
disabled. This made sense when the driver only supported host
controllers, but now that it supports peripheral controllers host
support isn't mandatory anymore.
Fix this by returning an error only when both the HCD and UDC functions
are disabled, either through the kernel configuration or at runtime.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/isp1760/isp1760-hcd.c')
| -rw-r--r-- | drivers/usb/isp1760/isp1760-hcd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c index 568446c9ce8d..996b2c157d12 100644 --- a/drivers/usb/isp1760/isp1760-hcd.c +++ b/drivers/usb/isp1760/isp1760-hcd.c @@ -2226,6 +2226,9 @@ error: void isp1760_hcd_unregister(struct isp1760_hcd *priv) { + if (!priv->hcd) + return; + usb_remove_hcd(priv->hcd); usb_put_hcd(priv->hcd); } |