aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/dummy_hcd.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2007-08-21 15:39:21 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 17:55:19 -0400
commitb0d9efba3ec53468984aecef8eeaf079089f2e5a (patch)
treea372d053daddc5ff041949b80bab347317a76938 /drivers/usb/gadget/dummy_hcd.c
parentee7d1f3f0c32d8abe9627aa73dc62ee5bf2daf7f (diff)
USB: centralize -EREMOTEIO handling
This patch (as969) continues the ongoing changes to the way HCDs report URB statuses. The programming interface has been simplified by making usbcore responsible for clearing urb->hcpriv and for setting -EREMOTEIO status when an URB with the URB_SHORT_NOT_OK flag ends up as a short transfer. By moving the work out of the HCDs, this removes a fair amount of repeated code. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> CC: David Brownell <david-b@pacbell.net> CC: Olav Kongas <ok@artecdesign.ee> CC: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> CC: Tony Olech <tony.olech@elandigitalsystems.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/dummy_hcd.c')
-rw-r--r--drivers/usb/gadget/dummy_hcd.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index c441d10c087e..0cb032526ca2 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -1099,8 +1099,7 @@ top:
1099 * 1099 *
1100 * partially filling a buffer optionally blocks queue advances 1100 * partially filling a buffer optionally blocks queue advances
1101 * (so completion handlers can clean up the queue) but we don't 1101 * (so completion handlers can clean up the queue) but we don't
1102 * need to emulate such data-in-flight. so we only show part 1102 * need to emulate such data-in-flight.
1103 * of the URB_SHORT_NOT_OK effect: completion status.
1104 */ 1103 */
1105 if (is_short) { 1104 if (is_short) {
1106 if (host_len == dev_len) { 1105 if (host_len == dev_len) {
@@ -1111,10 +1110,7 @@ top:
1111 if (dev_len > host_len) 1110 if (dev_len > host_len)
1112 maybe_set_status (urb, -EOVERFLOW); 1111 maybe_set_status (urb, -EOVERFLOW);
1113 else 1112 else
1114 maybe_set_status (urb, 1113 maybe_set_status (urb, 0);
1115 (urb->transfer_flags
1116 & URB_SHORT_NOT_OK)
1117 ? -EREMOTEIO : 0);
1118 } else if (!to_host) { 1114 } else if (!to_host) {
1119 maybe_set_status (urb, 0); 1115 maybe_set_status (urb, 0);
1120 if (host_len > dev_len) 1116 if (host_len > dev_len)
@@ -1516,7 +1512,6 @@ restart:
1516 continue; 1512 continue;
1517 1513
1518return_urb: 1514return_urb:
1519 urb->hcpriv = NULL;
1520 list_del (&urbp->urbp_list); 1515 list_del (&urbp->urbp_list);
1521 kfree (urbp); 1516 kfree (urbp);
1522 if (ep) 1517 if (ep)