summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2012-04-05 14:56:07 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-18 13:50:44 -0700
commit310e9e334f60ca8282990a9c56678a4f58bce81f (patch)
tree1f3d50d2d1ca4cffd0b10f371989a35645419e60 /drivers/usb/host
parent58c559e6509f276d0afb4621b2122e994e70160c (diff)
downloadblackbird-op-linux-310e9e334f60ca8282990a9c56678a4f58bce81f.tar.gz
blackbird-op-linux-310e9e334f60ca8282990a9c56678a4f58bce81f.zip
isp1760-if: make module unloads correctly
Without this patch, the prepared disable routines will not be called on module unloading. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/isp1760-if.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 4592dc17a9f9..fff114fd5461 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -398,6 +398,9 @@ static int __devinit isp1760_plat_probe(struct platform_device *pdev)
hcd = isp1760_register(mem_res->start, mem_size, irq_res->start,
irqflags, -ENOENT,
&pdev->dev, dev_name(&pdev->dev), devflags);
+
+ dev_set_drvdata(&pdev->dev, hcd);
+
if (IS_ERR(hcd)) {
pr_warning("isp1760: Failed to register the HCD device\n");
ret = -ENODEV;
@@ -417,11 +420,16 @@ static int __devexit isp1760_plat_remove(struct platform_device *pdev)
{
struct resource *mem_res;
resource_size_t mem_size;
+ struct usb_hcd *hcd = dev_get_drvdata(&pdev->dev);
+
+ usb_remove_hcd(hcd);
mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mem_size = resource_size(mem_res);
release_mem_region(mem_res->start, mem_size);
+ usb_put_hcd(hcd);
+
return 0;
}
OpenPOWER on IntegriCloud