Title: [8902] trunk/drivers/usb/musb: bug[#5964]maybe start the first request in the queue
- Revision
- 8902
- Author
- cliff
- Date
- 2010-06-10 02:57:51 -0400 (Thu, 10 Jun 2010)
Log Message
bug[#5964]maybe start the first request in the queue
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/musb_gadget.c (8901 => 8902)
--- trunk/drivers/usb/musb/musb_gadget.c 2010-06-10 06:15:44 UTC (rev 8901)
+++ trunk/drivers/usb/musb/musb_gadget.c 2010-06-10 06:57:51 UTC (rev 8902)
@@ -1099,7 +1099,7 @@
/*
* Context: controller locked, IRQs blocked.
*/
-static void musb_ep_restart(struct musb *musb, struct musb_request *req)
+void musb_ep_restart(struct musb *musb, struct musb_request *req)
{
DBG(3, "<== %s request %p len %u on hw_ep%d\n",
req->tx ? "TX/IN" : "RX/OUT",
Modified: trunk/drivers/usb/musb/musb_gadget.h (8901 => 8902)
--- trunk/drivers/usb/musb/musb_gadget.h 2010-06-10 06:15:44 UTC (rev 8901)
+++ trunk/drivers/usb/musb/musb_gadget.h 2010-06-10 06:57:51 UTC (rev 8902)
@@ -104,5 +104,5 @@
extern void musb_gadget_cleanup(struct musb *);
extern void musb_g_giveback(struct musb_ep *, struct usb_request *, int);
-
+extern void musb_ep_restart(struct musb *musb, struct musb_request *req);
#endif /* __MUSB_GADGET_H */
Modified: trunk/drivers/usb/musb/musb_gadget_ep0.c (8901 => 8902)
--- trunk/drivers/usb/musb/musb_gadget_ep0.c 2010-06-10 06:15:44 UTC (rev 8901)
+++ trunk/drivers/usb/musb/musb_gadget_ep0.c 2010-06-10 06:57:51 UTC (rev 8902)
@@ -264,6 +264,7 @@
void __iomem *regs;
int is_in;
u16 csr;
+ struct musb_request *request;
if (epnum == 0 || epnum >= MUSB_C_NUM_EPS ||
ctrlrequest->wValue != USB_ENDPOINT_HALT)
@@ -279,6 +280,8 @@
if (!musb_ep->desc)
break;
+ request = to_musb_request(next_request(musb_ep));
+
handled = 1;
/* Ignore request if endpoint is wedged */
if (musb_ep->wedged)
@@ -302,6 +305,11 @@
musb_writew(regs, MUSB_RXCSR, csr);
}
+ /* maybe start the first request in the queue */
+ if (!musb_ep->busy && request) {
+ DBG(3, "restarting the request\n");
+ musb_ep_restart(musb, request);
+ }
/* select ep0 again */
musb_ep_select(mbase, 0);
} break;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
