Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / usb / host / ohci-omap.c

diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 0231606d47c2fe9b00e4082a89594d0667815c8b..de7c68602a7e907fb5227205895d2352f28bd714 100644 (file)
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -183,7 +183,7 @@ static void start_hnp(struct ohci_hcd *ohci)
        otg_start_hnp(hcd->usb_phy->otg);
 
        local_irq_save(flags);
-       hcd->usb_phy->state = OTG_STATE_A_SUSPEND;
+       hcd->usb_phy->otg->state = OTG_STATE_A_SUSPEND;
        writel (RH_PS_PSS, &ohci->regs->roothub.portstatus [port]);
        l = omap_readl(OTG_CTRL);
        l &= ~OTG_A_BUSREQ;
@@ -481,7 +481,6 @@ static struct platform_driver ohci_hcd_omap_driver = {
        .resume         = ohci_omap_resume,
 #endif
        .driver         = {
-               .owner  = THIS_MODULE,
                .name   = "ohci",
        },
 };