mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 11:16:11 +00:00
USB: musb_gadget: fix kernel oops in txstate()
Commit 7723de7e19
(USB: musb_gadget: remove
pointless loop) included uncalled for (and incorrect) optimization that
might cause a kernel oops in txstate() -- undo it.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
4e092d110f
commit
95962a773c
1 changed files with 3 additions and 3 deletions
|
@ -515,12 +515,12 @@ void musb_g_tx(struct musb *musb, u8 epnum)
|
||||||
if (csr & MUSB_TXCSR_FIFONOTEMPTY)
|
if (csr & MUSB_TXCSR_FIFONOTEMPTY)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!musb_ep->desc) {
|
request = musb_ep->desc ? next_request(musb_ep) : NULL;
|
||||||
|
if (!request) {
|
||||||
DBG(4, "%s idle now\n",
|
DBG(4, "%s idle now\n",
|
||||||
musb_ep->end_point.name);
|
musb_ep->end_point.name);
|
||||||
return;
|
return;
|
||||||
} else
|
}
|
||||||
request = next_request(musb_ep);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
txstate(musb, to_musb_request(request));
|
txstate(musb, to_musb_request(request));
|
||||||
|
|
Loading…
Reference in a new issue