commit 00dbde71d292c449dfe454660df08fa66d96101f
author Linux Build Service Account <lnxbuild@localhost> Fri Feb 22 12:30:35 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Feb 22 12:30:35 2013 -0800
tree 27283eff7c1e51e07a896c88f53dfb65aec0246c
parent 3e3f309f9638bd32ae54df4aab1eefa68958ad4b
parent d110a5aa98724f138f794206942e86be67058c9c

Merge "usb: msm_otg: Don't enable OTG IRQ for wakeup if ASYNC IRQ is used"

drivers/usb/otg/msm_otg.c

diff --git a/drivers/usb/otg/msm_otg.c b/drivers/usb/otg/msm_otg.c
index 4d5bbf84..c69071d 100644
--- a/drivers/usb/otg/msm_otg.c
+++ b/drivers/usb/otg/msm_otg.c
@@ -1008,9 +1008,11 @@
 	}
 
 	if (device_may_wakeup(phy->dev)) {
-		enable_irq_wake(motg->irq);
 		if (motg->async_irq)
 			enable_irq_wake(motg->async_irq);
+		else
+			enable_irq_wake(motg->irq);
+
 		if (motg->pdata->pmic_id_irq)
 			enable_irq_wake(motg->pdata->pmic_id_irq);
 		if (pdata->otg_control == OTG_PHY_CONTROL &&
@@ -1117,9 +1119,11 @@
 
 skip_phy_resume:
 	if (device_may_wakeup(phy->dev)) {
-		disable_irq_wake(motg->irq);
 		if (motg->async_irq)
 			disable_irq_wake(motg->async_irq);
+		else
+			disable_irq_wake(motg->irq);
+
 		if (motg->pdata->pmic_id_irq)
 			disable_irq_wake(motg->pdata->pmic_id_irq);
 		if (pdata->otg_control == OTG_PHY_CONTROL &&