Title: [9221] trunk/drivers/usb/musb: musb: use request restart patch that was merged upstream
- Revision
- 9221
- Author
- vapier
- Date
- 2010-10-16 17:13:03 -0400 (Sat, 16 Oct 2010)
Log Message
musb: use request restart patch that was merged upstream
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/musb_gadget.h (9220 => 9221)
--- trunk/drivers/usb/musb/musb_gadget.h 2010-10-16 21:12:24 UTC (rev 9220)
+++ trunk/drivers/usb/musb/musb_gadget.h 2010-10-16 21:13:03 UTC (rev 9221)
@@ -104,6 +104,7 @@
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);
+extern void musb_ep_restart(struct musb *, struct musb_request *);
+
#endif /* __MUSB_GADGET_H */
Modified: trunk/drivers/usb/musb/musb_gadget_ep0.c (9220 => 9221)
--- trunk/drivers/usb/musb/musb_gadget_ep0.c 2010-10-16 21:12:24 UTC (rev 9220)
+++ trunk/drivers/usb/musb/musb_gadget_ep0.c 2010-10-16 21:13:03 UTC (rev 9221)
@@ -261,10 +261,10 @@
ctrlrequest->wIndex & 0x0f;
struct musb_ep *musb_ep;
struct musb_hw_ep *ep;
+ struct musb_request *request;
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)
@@ -280,8 +280,6 @@
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)
@@ -305,11 +303,14 @@
musb_writew(regs, MUSB_RXCSR, csr);
}
- /* maybe start the first request in the queue */
+ /* Maybe start the first request in the queue */
+ request = to_musb_request(
+ next_request(musb_ep));
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
