summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/musb_regs.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-08-28 07:00:20 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-08-28 07:00:20 +0200
commit4b61bb575b1fb42ab1df228ae7812e5135f656da (patch)
tree03456466e6f678456ea462a7da4b352d1aa03aa3 /drivers/usb/musb/musb_regs.h
parentInput: xpad - add USB ID for the drumkit controller from Rock Band (diff)
parentLinux 2.6.31-rc8 (diff)
downloadlinux-4b61bb575b1fb42ab1df228ae7812e5135f656da.tar.xz
linux-4b61bb575b1fb42ab1df228ae7812e5135f656da.zip
Merge commit 'v2.6.31-rc8' into next
Diffstat (limited to 'drivers/usb/musb/musb_regs.h')
-rw-r--r--drivers/usb/musb/musb_regs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_regs.h b/drivers/usb/musb/musb_regs.h
index de3b2f18db44..fbfd3fd9ce1f 100644
--- a/drivers/usb/musb/musb_regs.h
+++ b/drivers/usb/musb/musb_regs.h
@@ -323,6 +323,7 @@ static inline void musb_write_rxfifoadd(void __iomem *mbase, u16 c_off)
static inline u8 musb_read_configdata(void __iomem *mbase)
{
+ musb_writeb(mbase, MUSB_INDEX, 0);
return musb_readb(mbase, 0x10 + MUSB_CONFIGDATA);
}