Commit 589a0083 authored by Olav Kongas's avatar Olav Kongas Committed by Greg Kroah-Hartman

[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: default avatarOlav Kongas <ok@artecdesign.ee>
parent 4808a1c0
...@@ -1501,6 +1501,12 @@ static int isp116x_reset(struct usb_hcd *hcd) ...@@ -1501,6 +1501,12 @@ static int isp116x_reset(struct usb_hcd *hcd)
} }
if (!clkrdy) { if (!clkrdy) {
ERR("Clock not ready after 20ms\n"); 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; ret = -ENODEV;
} }
return ret; return ret;
...@@ -1678,10 +1684,13 @@ static struct hc_driver isp116x_hc_driver = { ...@@ -1678,10 +1684,13 @@ static struct hc_driver isp116x_hc_driver = {
static int __init_or_module isp116x_remove(struct device *dev) static int __init_or_module isp116x_remove(struct device *dev)
{ {
struct usb_hcd *hcd = dev_get_drvdata(dev); struct usb_hcd *hcd = dev_get_drvdata(dev);
struct isp116x *isp116x = hcd_to_isp116x(hcd); struct isp116x *isp116x;
struct platform_device *pdev; struct platform_device *pdev;
struct resource *res; struct resource *res;
if(!hcd)
return 0;
isp116x = hcd_to_isp116x(hcd);
pdev = container_of(dev, struct platform_device, dev); pdev = container_of(dev, struct platform_device, dev);
remove_debug_file(isp116x); remove_debug_file(isp116x);
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment