[3/8] musb: fix compilation warning in host only mode

Commit Message

Sergei Shtylyov June 24, 2010, 1:10 p.m. UTC

None

Patch

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index a8b0440..ed6e1a4 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -704,7 +704,6 @@  static irqreturn_t musb_stage0_irq(struct musb *musb, u8
  #ifdef CONFIG_USB_MUSB_HDRC_HCD
  	if (int_usb & MUSB_INTR_CONNECT) {
  		struct usb_hcd *hcd = musb_to_hcd(musb);
-		void __iomem *mbase = musb->mregs;

  		handled = IRQ_HANDLED;
  		musb->is_active = 1;
@@ -714,12 +713,16 @@  static irqreturn_t musb_stage0_irq(struct musb

  #ifdef CONFIG_USB_MUSB_OTG
  		/* flush endpoints when transitioning from Device Mode */
- 		if (is_peripheral_active(musb)) {
- 			/* REVISIT HNP; just force disconnect */
- 		}
-		musb_writew(mbase, MUSB_INTRTXE, musb->epmask);
-		musb_writew(mbase, MUSB_INTRRXE, musb->epmask & 0xfffe);
-		musb_writeb(mbase, MUSB_INTRUSBE, 0xf7);
+		{
+			void __iomem *mbase = musb->mregs;
+
+			if (is_peripheral_active(musb)) {
+				/* REVISIT HNP; just force disconnect */
+			}
+			musb_writew(mbase, MUSB_INTRTXE, musb->epmask);
+			musb_writew(mbase, MUSB_INTRRXE, musb->epmask & 0xfffe);
+			musb_writeb(mbase, MUSB_INTRUSBE, 0xf7);
+		}
#endif
  		musb->port1_status &= ~(USB_PORT_STAT_LOW_SPEED
  					|USB_PORT_STAT_HIGH_SPEED