summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2011-03-31 11:24:07 +0800
committerPeter Chen <peter.chen@freescale.com>2011-03-31 11:26:11 +0800
commitc0b2882d78ebf70af66694be2efb6535c96d812c (patch)
tree6aa09f54cdf4546a74b0d73d6c3cee678a3cefba
parent4e521125a8d70f33bcaabb99a53d0ef4616ec94f (diff)
ENGR00141393 usb: revert one tiny change
The variables for low power should be updated after phcd updated Signed-off-by: Peter Chen <peter.chen@freescale.com>
-rw-r--r--drivers/usb/gadget/arcotg_udc.c2
-rw-r--r--drivers/usb/host/ehci-arc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c
index 0b5c8b66256d..9f12c9f062c0 100644
--- a/drivers/usb/gadget/arcotg_udc.c
+++ b/drivers/usb/gadget/arcotg_udc.c
@@ -320,7 +320,6 @@ static void dr_phy_low_power_mode(struct fsl_udc *udc, bool enable)
struct fsl_usb2_platform_data *pdata = udc->pdata;
u32 portsc;
- pdata->lowpower = enable;
if (pdata && pdata->phy_lowpower_suspend) {
pdata->phy_lowpower_suspend(pdata, enable);
} else {
@@ -334,6 +333,7 @@ static void dr_phy_low_power_mode(struct fsl_udc *udc, bool enable)
fsl_writel(portsc, &dr_regs->portsc1);
}
}
+ pdata->lowpower = enable;
}
diff --git a/drivers/usb/host/ehci-arc.c b/drivers/usb/host/ehci-arc.c
index e54eef85237c..8178ba150502 100644
--- a/drivers/usb/host/ehci-arc.c
+++ b/drivers/usb/host/ehci-arc.c
@@ -33,8 +33,6 @@ extern int usb_host_wakeup_irq(struct device *wkup_dev);
extern void usb_host_set_wakeup(struct device *wkup_dev, bool para);
static void fsl_usb_lowpower_mode(struct fsl_usb2_platform_data *pdata, bool enable)
{
- pdata->lowpower = enable;
-
if (enable) {
if (pdata->phy_lowpower_suspend)
pdata->phy_lowpower_suspend(pdata, true);
@@ -42,6 +40,8 @@ static void fsl_usb_lowpower_mode(struct fsl_usb2_platform_data *pdata, bool ena
if (pdata->phy_lowpower_suspend)
pdata->phy_lowpower_suspend(pdata, false);
}
+
+ pdata->lowpower = enable;
}
static void fsl_usb_clk_gate(struct fsl_usb2_platform_data *pdata, bool enable)