Title: [8738] trunk/drivers/usb/musb/musb_core.c: musb: fix thinko in unused warning change
- Revision
- 8738
- Author
- vapier
- Date
- 2010-05-21 05:50:52 -0400 (Fri, 21 May 2010)
Log Message
musb: fix thinko in unused warning change
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/musb_core.c (8737 => 8738)
--- trunk/drivers/usb/musb/musb_core.c 2010-05-21 09:36:51 UTC (rev 8737)
+++ trunk/drivers/usb/musb/musb_core.c 2010-05-21 09:50:52 UTC (rev 8738)
@@ -627,6 +627,7 @@
if (int_usb & MUSB_INTR_CONNECT) {
struct usb_hcd *hcd = musb_to_hcd(musb);
+ void __iomem __maybe_unused *mbase = musb->mregs;
handled = IRQ_HANDLED;
musb->is_active = 1;
@@ -638,12 +639,10 @@
/* flush endpoints when transitioning from Device Mode */
if (is_peripheral_active(musb)) {
/* REVISIT HNP; just force disconnect */
- } else {
- void __iomem *mbase = musb->mregs;
- musb_writew(mbase, MUSB_INTRTXE, musb->epmask);
- musb_writew(mbase, MUSB_INTRRXE, musb->epmask & 0xfffe);
- musb_writeb(mbase, MUSB_INTRUSBE, 0xf7);
}
+ 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
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
