diff options
Diffstat (limited to 'drivers/usb/host/ehci-fsl.c')
-rw-r--r-- | drivers/usb/host/ehci-fsl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 34a3140d1e5f..e90344a17631 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c | |||
@@ -134,7 +134,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
134 | 134 | ||
135 | /* Don't need to set host mode here. It will be done by tdi_reset() */ | 135 | /* Don't need to set host mode here. It will be done by tdi_reset() */ |
136 | 136 | ||
137 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED); | 137 | retval = usb_add_hcd(hcd, irq, IRQF_SHARED); |
138 | if (retval != 0) | 138 | if (retval != 0) |
139 | goto err4; | 139 | goto err4; |
140 | 140 | ||
@@ -392,7 +392,7 @@ static int ehci_fsl_mpc512x_drv_suspend(struct device *dev) | |||
392 | 392 | ||
393 | dev_dbg(dev, "suspending...\n"); | 393 | dev_dbg(dev, "suspending...\n"); |
394 | 394 | ||
395 | hcd->state = HC_STATE_SUSPENDED; | 395 | ehci->rh_state = EHCI_RH_SUSPENDED; |
396 | dev->power.power_state = PMSG_SUSPEND; | 396 | dev->power.power_state = PMSG_SUSPEND; |
397 | 397 | ||
398 | /* ignore non-host interrupts */ | 398 | /* ignore non-host interrupts */ |
@@ -481,7 +481,7 @@ static int ehci_fsl_mpc512x_drv_resume(struct device *dev) | |||
481 | ehci_writel(ehci, pdata->pm_portsc, &ehci->regs->port_status[0]); | 481 | ehci_writel(ehci, pdata->pm_portsc, &ehci->regs->port_status[0]); |
482 | 482 | ||
483 | set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); | 483 | set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); |
484 | hcd->state = HC_STATE_RUNNING; | 484 | ehci->rh_state = EHCI_RH_RUNNING; |
485 | dev->power.power_state = PMSG_ON; | 485 | dev->power.power_state = PMSG_ON; |
486 | 486 | ||
487 | tmp = ehci_readl(ehci, &ehci->regs->command); | 487 | tmp = ehci_readl(ehci, &ehci->regs->command); |