Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[platform/kernel/linux-stable.git] / drivers / usb / host / ehci-platform.c

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index d1f5cea..5196d72 100644 (file)
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -152,7 +152,6 @@ static int ehci_platform_remove(struct platform_device *dev)
 
        usb_remove_hcd(hcd);
        usb_put_hcd(hcd);
-       platform_set_drvdata(dev, NULL);
 
        if (pdata->power_off)
                pdata->power_off(dev);
@@ -230,7 +229,7 @@ static struct platform_driver ehci_platform_driver = {
                .owner  = THIS_MODULE,
                .name   = "ehci-platform",
                .pm     = &ehci_platform_pm_ops,
-               .of_match_table = of_match_ptr(vt8500_ehci_ids),
+               .of_match_table = vt8500_ehci_ids,
        }
 };