Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / drivers / usb / host / ohci-pxa27x.c

diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 8ad9b3b604b5e0aeb9185281af70649617c7b48d..127b1579902458a08e1765b08d21660c0c14585b 100644 (file)
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -27,6 +27,7 @@
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */
 #include <asm/arch/ohci.h>
 
 #define PXA_UHC_MAX_PORTNUM    3
@@ -104,7 +105,7 @@ static int pxa27x_start_hc(struct device *dev)
        UHCHIE = (UHCHIE_UPRIE | UHCHIE_RWIE);
 
        /* Clear any OTG Pin Hold */
-       if (PSSR & PSSR_OTGPH)
+       if (cpu_is_pxa27x() && (PSSR & PSSR_OTGPH))
                PSSR |= PSSR_OTGPH;
 
        return 0;
@@ -339,7 +340,6 @@ static int ohci_hcd_pxa27x_drv_suspend(struct platform_device *pdev, pm_message_
 
        pxa27x_stop_hc(&pdev->dev);
        hcd->state = HC_STATE_SUSPENDED;
-       pdev->dev.power.power_state = PMSG_SUSPEND;
 
        return 0;
 }
@@ -357,9 +357,7 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)
        if ((status = pxa27x_start_hc(&pdev->dev)) < 0)
                return status;
 
-       pdev->dev.power.power_state = PMSG_ON;
-       usb_hcd_resume_root_hub(hcd);
-
+       ohci_finish_controller_resume(hcd);
        return 0;
 }
 #endif