Merge "USB: msm72k_otg: Fix USB LPM issue during system suspend" into msm-3.0

This commit is contained in:
Linux Build Service Account
2012-05-22 10:28:20 -07:00
committed by QuIC Gerrit Code Review
+7 -1
View File
@@ -889,7 +889,13 @@ static void msm_otg_resume_w(struct work_struct *w)
if (can_phy_power_collapse(dev) && dev->pdata->ldo_enable)
dev->pdata->ldo_enable(1);
msm_otg_get_resume(dev);
if (pm_runtime_enabled(dev->otg.dev)) {
msm_otg_get_resume(dev);
} else {
pm_runtime_get_noresume(dev->otg.dev);
msm_otg_resume(dev);
pm_runtime_set_active(dev->otg.dev);
}
if (!is_phy_clk_disabled())
goto phy_resumed;