Commit 95962a77 authored Dec 16, 2009 by Sergei Shtylyov Committed by Greg Kroah-Hartman Dec 23, 2009

USB: musb_gadget: fix kernel oops in txstate()



Commit 7723de7e (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>

parent 4e092d11

drivers/usb/musb/musb_gadget.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -515,12 +515,12 @@ void musb_g_tx(struct musb *musb, u8 epnum)
		if (csr & MUSB_TXCSR_FIFONOTEMPTY)
		return;

		if (!musb_ep->desc) {
		request = musb_ep->desc ? next_request(musb_ep) : NULL;
		if (!request) {
		DBG(4, "%s idle now\n",
		musb_ep->end_point.name);
		return;
		} else
		request = next_request(musb_ep);
		}
		}

		txstate(musb, to_musb_request(request));