Title: [8730] trunk/drivers/usb/musb/musb_core.c: musb: fix unused mbase warning
- Revision
- 8730
- Author
- vapier
- Date
- 2010-05-21 03:04:55 -0400 (Fri, 21 May 2010)
Log Message
musb: fix unused mbase warning
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/musb_core.c (8729 => 8730)
--- trunk/drivers/usb/musb/musb_core.c 2010-05-21 05:58:40 UTC (rev 8729)
+++ trunk/drivers/usb/musb/musb_core.c 2010-05-21 07:04:55 UTC (rev 8730)
@@ -627,7 +627,6 @@
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;
@@ -639,10 +638,12 @@
/* 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
