Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[pandora-kernel.git] / drivers / usb / host / ehci-au1xxx.c

diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c
index e480dc1..18bafa9 100644 (file)
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
@@ -123,7 +123,7 @@ static int ehci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
        ehci->hcs_params = readl(&ehci->caps->hcs_params);
 
        ret = usb_add_hcd(hcd, pdev->resource[1].start,
-                         IRQF_DISABLED | IRQF_SHARED);
+                         IRQF_SHARED);
        if (ret == 0) {
                platform_set_drvdata(pdev, hcd);
                return ret;
@@ -236,7 +236,7 @@ static int ehci_hcd_au1xxx_drv_resume(struct device *dev)
        /* here we "know" root ports should always stay powered */
        ehci_port_power(ehci, 1);
 
-       hcd->state = HC_STATE_SUSPENDED;
+       ehci->rh_state = EHCI_RH_SUSPENDED;
 
        return 0;
 }