2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/f_loopback.c
index 6d87f288df4e..2c0cd824c667 100644
--- a/drivers/usb/gadget/f_loopback.c
+++ b/drivers/usb/gadget/f_loopback.c
@@ -418,7 +418,7 @@ int __init loopback_add(struct usb_composite_dev *cdev, bool autoresume)
 
         /* support autoresume for remote wakeup testing */
         if (autoresume)
-                sourcesink_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
+                loopback_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
 
         /* support OTG systems */
         if (gadget_is_otg(cdev->gadget)) {
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index e61aa95f2d2a..1d5eda26fbd1 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -39,7 +39,8 @@
 
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
         && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \
-        && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN)
+        && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \
+        && !defined(CONFIG_MIPS)
 static inline void readsl(const void __iomem *addr, void *buf, int len)
         { insl((unsigned long)addr, buf, len); }
 static inline void readsw(const void __iomem *addr, void *buf, int len)