UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: musb: be careful when using different fifo_modes 

if we have more endpoints configured than
enabled on fifo_mode, then we need to be
careful on save/restore context operations,
otherwise we will try to access uninitialized
__iomem pointer.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Felipe Balbi 2011-06-27 15:57:46 +03:00 committed by Greg Kroah-Hartman
parent fc0b721f27
commit e4e5b136eb
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/usb/musb/musb_core.c
View File

@ -2214,7 +2214,16 @@ static void musb_save_context(struct musb *musb)
musb->context.devctl = musb_readb(musb_base, MUSB_DEVCTL); musb->context.devctl = musb_readb(musb_base, MUSB_DEVCTL);
for (i = 0; i < musb->config->num_eps; ++i) { for (i = 0; i < musb->config->num_eps; ++i) {
epio = musb->endpoints[i].regs; struct musb_hw_ep *hw_ep;
hw_ep = &musb->endpoints[i];
if (!hw_ep)
continue;
epio = hw_ep->regs;
if (!epio)
continue;
musb->context.index_regs[i].txmaxp = musb->context.index_regs[i].txmaxp =
musb_readw(epio, MUSB_TXMAXP); musb_readw(epio, MUSB_TXMAXP);
musb->context.index_regs[i].txcsr = musb->context.index_regs[i].txcsr =
@ -2280,7 +2289,16 @@ static void musb_restore_context(struct musb *musb)
musb_writeb(musb_base, MUSB_DEVCTL, musb->context.devctl); musb_writeb(musb_base, MUSB_DEVCTL, musb->context.devctl);
for (i = 0; i < musb->config->num_eps; ++i) { for (i = 0; i < musb->config->num_eps; ++i) {
epio = musb->endpoints[i].regs; struct musb_hw_ep *hw_ep;
hw_ep = &musb->endpoints[i];
if (!hw_ep)
continue;
epio = hw_ep->regs;
if (!epio)
continue;
musb_writew(epio, MUSB_TXMAXP, musb_writew(epio, MUSB_TXMAXP,
musb->context.index_regs[i].txmaxp); musb->context.index_regs[i].txmaxp);
musb_writew(epio, MUSB_TXCSR, musb_writew(epio, MUSB_TXCSR,