Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32233716 authored by Giuseppe GORGOGLIONE's avatar Giuseppe GORGOGLIONE Committed by Greg Kroah-Hartman
Browse files

USB: musb: fix init oops crash with static FIFO config 



Correct musb_read_fifosize() and musb_configure_ep0() functions
for the #ifndef BLACKFIN branch when the silicon uses static FIFO
configuration.  (Most current silicon configures this controller
to use dynamic FIFO configuration; some parts from ST don't, like
the STM STA2062.)

Signed-off-by: default avatarGiuseppe GORGOGLIONE <giuseppe.gorgoglione@st.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1e0320f0

drivers/usb/musb/musb_core.h

+3 −1
Original line number Diff line number Diff line
@@ -478,10 +478,11 @@ static inline void musb_configure_ep0(struct musb *musb) 
static inline int musb_read_fifosize(struct musb *musb,

		struct musb_hw_ep *hw_ep, u8 epnum)

{

	void *mbase = musb->mregs;

	u8 reg = 0;



	/* read from core using indexed model */

	reg = musb_readb(hw_ep->regs, 0x10 + MUSB_FIFOSIZE);

	reg = musb_readb(mbase, MUSB_EP_OFFSET(epnum, MUSB_FIFOSIZE));

	/* 0's returned when no more endpoints */

	if (!reg)

		return -ENODEV;
@@ -508,6 +509,7 @@ static inline void musb_configure_ep0(struct musb *musb) 
{

	musb->endpoints[0].max_packet_sz_tx = MUSB_EP0_FIFOSIZE;

	musb->endpoints[0].max_packet_sz_rx = MUSB_EP0_FIFOSIZE;

	musb->endpoints[0].is_shared_fifo = true;

}

#endif /* CONFIG_BLACKFIN */