From: David Brownell <dbrownell@users.sourceforge.net>
Date: Fri, 8 Sep 2006 07:52:17 +0000 (+0300)
Subject: MUSB: Enable the TUSB irq signal as a wake event source
X-Git-Tag: v2.6.18-omap1~81
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f7efccb535211bb950f357165346ca598dd23105;p=linux-2.6-omap-h63xx.git

MUSB: Enable the TUSB irq signal as a wake event source

Enable the TUSB irq signal as a wake event source.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index 919fd0c0a8d..4f859246f9c 100644
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -1525,8 +1525,10 @@ static void musb_free(struct musb *musb)
 	musb_gadget_cleanup(musb);
 #endif
 
-	if (musb->nIrq >= 0)
+	if (musb->nIrq >= 0) {
+		disable_irq_wake(musb->nIrq);
 		free_irq(musb->nIrq, musb);
+	}
 	if (is_dma_capable() && musb->pDmaController) {
 		struct dma_controller	*c = musb->pDmaController;
 
@@ -1648,6 +1650,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
 		status = -ENODEV;
 		goto fail2;
 	}
+	(void) enable_irq_wake(nIrq);
 	pThis->nIrq = nIrq;
 	device_init_wakeup(dev, 1);