USB UHCI driver

The patch ensures that uhci.c doesn't use urb->status after the
completion callback if it doesn't need to.

diff --git a/drivers/usb/uhci.c b/drivers/usb/uhci.c
index 8275322abeeb30c01f115c3dd9874d4590e0154b..27a902aefcb20fbb0c57fffe3e314260979b8424 100644 (file)
--- a/drivers/usb/uhci.c
+++ b/drivers/usb/uhci.c
@@ -2370,15 +2370,15 @@ static void uhci_call_completion(struct urb *urb)
        urb->dev = NULL;
        spin_unlock_irqrestore(&urb->lock, flags);
 
-       if (urb->complete) {
+       if (urb->complete)
                urb->complete(urb);
 
+       if (resubmit_interrupt)
                /* Recheck the status. The completion handler may have */
                /*  unlinked the resubmitting interrupt URB */
                killed = (urb->status == -ENOENT ||
                          urb->status == -ECONNABORTED ||
                          urb->status == -ECONNRESET);
-       }
 
        if (resubmit_interrupt && !killed) {
                urb->dev = dev;