1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index ec17fc4d2861..8b17babf5c55 100644
--- a/drivers/usb/core/hcd.c
+++ b/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);