From: Kevin Hilman <khilman@mvista.com>
Date: Fri, 17 Aug 2007 16:47:24 +0000 (-0700)
Subject: ARM: OMAP: MUSB: IRQ reset: babble handling is host only
X-Git-Tag: v2.6.23-omap1~163
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=84e28a2065a57efa7a1e82650949128bcd57e31a;p=linux-2.6-omap-h63xx.git

ARM: OMAP: MUSB: IRQ reset: babble handling is host only

In reset IRQ, move babble handling inside a host-ifdef since it
doesn't apply (or compile) for gadget.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index 48f4334a7c4..dacf930c7ff 100644
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -603,6 +603,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,
 	 * only host sees babble; only peripheral sees bus reset.
 	 */
 	if (int_usb & MUSB_INTR_RESET) {
+#ifdef CONFIG_USB_MUSB_HDRC_HCD
 		if (devctl & MUSB_DEVCTL_HM) {
 			/*
 			 * Looks like non-HS BABBLE can be ignored, but
@@ -617,7 +618,9 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,
 				ERR("Stopping host session because of babble\n");
 				musb_writeb(mbase, MUSB_DEVCTL, 0);
 			}
-		} else {
+		} else
+#endif	/* CONFIG_USB_MUSB_HDRC_HCD */
+		{
 			DBG(1, "BUS RESET\n");
 
 			musb_g_reset(musb);