[PATCH] USB: Fix oops at rmmod after failed probe in isp116x-hcd

This patch fixes an oops triggered at rmmod of isp116x-hcd
after the probe() has failed.

Also, it extends the error message printed, if the driver
cannot detect "Chip's Clock Ready" after a software reset.
As Ian Campbell recently reported, this happens if the
chip's H_WAKEUP pin is not pulled low during software reset.
Several people have already had this issue, hence the update
to the error message.

Also, extend the error message about the failed clock
detection after the software reset.

Signed-off-by: Olav Kongas <ok@artecdesign.ee>

diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 69e7433d9ce8b5e186266a4e61318c02a642c37e..1183988fdf547a18f10d2b9486a99f539550e7c1 100644 (file)
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1501,6 +1501,12 @@ static int isp116x_reset(struct usb_hcd *hcd)
        }
        if (!clkrdy) {
                ERR("Clock not ready after 20ms\n");
+               /* After sw_reset the clock won't report to be ready, if
+                  H_WAKEUP pin is high. */
+               if (!isp116x->board || !isp116x->board->reset)
+                       ERR("The driver does not support hardware wakeup.\n");
+                       ERR("Please make sure that the H_WAKEUP pin "
+                               "is pulled low!\n");
                ret = -ENODEV;
        }
        return ret;
@@ -1678,10 +1684,13 @@ static struct hc_driver isp116x_hc_driver = {
 static int __init_or_module isp116x_remove(struct device *dev)
 {
        struct usb_hcd *hcd = dev_get_drvdata(dev);
-       struct isp116x *isp116x = hcd_to_isp116x(hcd);
+       struct isp116x *isp116x;
        struct platform_device *pdev;
        struct resource *res;
 
+       if(!hcd)
+               return 0;
+       isp116x = hcd_to_isp116x(hcd);
        pdev = container_of(dev, struct platform_device, dev);
        remove_debug_file(isp116x);
        usb_remove_hcd(hcd);