---

yaml --- r: 155950 b: refs/heads/master c: 2bbff7b h: refs/heads/master v: v3
git-mirror · Jul 28, 2009 · 08e7625 · 08e7625
1 parent 935a5c3
commit 08e7625
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a9f5bd82dc986d496d8484ff54b107b4515f43f
+refs/heads/master: 2bbff7b742d55b094ed1467702efe146cd60c64f
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
@@ -1326,7 +1326,6 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
 	int		i;
 
 	/* log core options (read using indexed model) */
-	musb_ep_select(mbase, 0);
 	reg = musb_read_configdata(mbase);
 
 	strcpy(aInfo, (reg & MUSB_CONFIGDATA_UTMIDW) ? "UTMI-16" : "UTMI-8");

diff --git a/trunk/drivers/usb/musb/musb_regs.h b/trunk/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);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     static inline u8 musb_read_configdata(void __iomem *mbase)
     {
+    	musb_writeb(mbase, MUSB_INDEX, 0);
     	return musb_readb(mbase, 0x10 + MUSB_CONFIGDATA);
     }
@@ Expand Down @@