---

yaml --- r: 67866 b: refs/heads/master c: 1f5a3d0 h: refs/heads/master v: v3
git-mirror · Oct 12, 2007 · aecd148 · aecd148
1 parent 3228b6f
commit aecd148
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed6e52829c113ca18f042ac55cc77b1b90745eab
+refs/heads/master: 1f5a3d0f34fd5719081c6b8f3dbbcbe328d4da31
diff --git a/trunk/drivers/usb/core/hcd.c b/trunk/drivers/usb/core/hcd.c
@@ -1266,9 +1266,6 @@ int usb_hcd_unlink_urb (struct urb *urb, int status)
  */
 void usb_hcd_giveback_urb (struct usb_hcd *hcd, struct urb *urb)
 {
-	unmap_urb_for_dma(hcd, urb);
-	usbmon_urb_complete (&hcd->self, urb);
-	usb_unanchor_urb(urb);
 	urb->hcpriv = NULL;
 	if (unlikely(urb->unlinked))
 		urb->status = urb->unlinked;
@@ -1277,6 +1274,10 @@ void usb_hcd_giveback_urb (struct usb_hcd *hcd, struct urb *urb)
 			!urb->status))
 		urb->status = -EREMOTEIO;
 
+	unmap_urb_for_dma(hcd, urb);
+	usbmon_urb_complete(&hcd->self, urb);
+	usb_unanchor_urb(urb);
+
 	/* pass ownership to the completion handler */
 	urb->complete (urb);
 	atomic_dec (&urb->use_count);