12 files changed, 128 insertions, 105 deletions

diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index d72c42e5f22d..e9fdbc8997b3 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/usb.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 
 #ifdef CONFIG_USB_DEBUG
@@ -80,7 +81,7 @@ MODULE_DEVICE_TABLE(usb, device_table);
 
 /* Structure to hold all of our device specific stuff */
 struct adu_device {
-        struct semaphore        sem; /* locks this structure */
+        struct mutex            mtx; /* locks this structure */
         struct usb_device*      udev; /* save off the usb device pointer */
         struct usb_interface*   interface;
         unsigned char           minor; /* the starting minor number for this device */
@@ -178,17 +179,18 @@ static void adu_delete(struct adu_device *dev)
 static void adu_interrupt_in_callback(struct urb *urb)
 {
         struct adu_device *dev = urb->context;
+        int status = urb->status;
 
-        dbg(4," %s : enter, status %d", __FUNCTION__, urb->status);
+        dbg(4," %s : enter, status %d", __FUNCTION__, status);
         adu_debug_data(5, __FUNCTION__, urb->actual_length,
                        urb->transfer_buffer);
 
         spin_lock(&dev->buflock);
 
-        if (urb->status != 0) {
-                if ((urb->status != -ENOENT) && (urb->status != -ECONNRESET)) {
+        if (status != 0) {
+                if ((status != -ENOENT) && (status != -ECONNRESET)) {
                         dbg(1," %s : nonzero status received: %d",
-                            __FUNCTION__, urb->status);
+                            __FUNCTION__, status);
                 }
                 goto exit;
         }
@@ -216,21 +218,22 @@ exit:
         wake_up_interruptible(&dev->read_wait);
         adu_debug_data(5, __FUNCTION__, urb->actual_length,
                        urb->transfer_buffer);
-        dbg(4," %s : leave, status %d", __FUNCTION__, urb->status);
+        dbg(4," %s : leave, status %d", __FUNCTION__, status);
 }
 
 static void adu_interrupt_out_callback(struct urb *urb)
 {
         struct adu_device *dev = urb->context;
+        int status = urb->status;
 
-        dbg(4," %s : enter, status %d", __FUNCTION__, urb->status);
+        dbg(4," %s : enter, status %d", __FUNCTION__, status);
         adu_debug_data(5,__FUNCTION__, urb->actual_length, urb->transfer_buffer);
 
-        if (urb->status != 0) {
-                if ((urb->status != -ENOENT) &&
-                    (urb->status != -ECONNRESET)) {
+        if (status != 0) {
+                if ((status != -ENOENT) &&
+                    (status != -ECONNRESET)) {
                         dbg(1, " %s :nonzero status received: %d",
-                            __FUNCTION__, urb->status);
+                            __FUNCTION__, status);
                 }
                 goto exit;
         }
@@ -240,7 +243,7 @@ exit:
 
         adu_debug_data(5, __FUNCTION__, urb->actual_length,
                        urb->transfer_buffer);
-        dbg(4," %s : leave, status %d", __FUNCTION__, urb->status);
+        dbg(4," %s : leave, status %d", __FUNCTION__, status);
 }
 
 static int adu_open(struct inode *inode, struct file *file)
@@ -269,8 +272,8 @@ static int adu_open(struct inode *inode, struct file *file)
         }
 
         /* lock this device */
-        if ((retval = down_interruptible(&dev->sem))) {
-                dbg(2, "%s : sem down failed", __FUNCTION__);
+        if ((retval = mutex_lock_interruptible(&dev->mtx))) {
+                dbg(2, "%s : mutex lock failed", __FUNCTION__);
                 goto exit_no_device;
         }
 
@@ -299,7 +302,7 @@ static int adu_open(struct inode *inode, struct file *file)
                 if (retval)
                         --dev->open_count;
         }
-        up(&dev->sem);
+        mutex_unlock(&dev->mtx);
 
 exit_no_device:
         dbg(2,"%s : leave, return value %d ", __FUNCTION__, retval);
@@ -347,7 +350,7 @@ static int adu_release(struct inode *inode, struct file *file)
         }
 
         /* lock our device */
-        down(&dev->sem); /* not interruptible */
+        mutex_lock(&dev->mtx); /* not interruptible */
 
         if (dev->open_count <= 0) {
                 dbg(1," %s : device not opened", __FUNCTION__);
@@ -357,7 +360,7 @@ static int adu_release(struct inode *inode, struct file *file)
 
         if (dev->udev == NULL) {
                 /* the device was unplugged before the file was released */
-                up(&dev->sem);
+                mutex_unlock(&dev->mtx);
                 adu_delete(dev);
                 dev = NULL;
         } else {
@@ -367,7 +370,7 @@ static int adu_release(struct inode *inode, struct file *file)
 
 exit:
         if (dev)
-                up(&dev->sem);
+                mutex_unlock(&dev->mtx);
         dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
         return retval;
 }
@@ -390,7 +393,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
         dev = file->private_data;
         dbg(2," %s : dev=%p", __FUNCTION__, dev);
         /* lock this object */
-        if (down_interruptible(&dev->sem))
+        if (mutex_lock_interruptible(&dev->mtx))
                 return -ERESTARTSYS;
 
         /* verify that the device wasn't unplugged */
@@ -522,7 +525,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
 
 exit:
         /* unlock the device */
-        up(&dev->sem);
+        mutex_unlock(&dev->mtx);
 
         dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
         return retval;
@@ -543,7 +546,7 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
         dev = file->private_data;
 
         /* lock this object */
-        retval = down_interruptible(&dev->sem);
+        retval = mutex_lock_interruptible(&dev->mtx);
         if (retval)
                 goto exit_nolock;
 
@@ -571,9 +574,9 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
                                 retval = -EINTR;
                                 goto exit;
                         }
-                        up(&dev->sem);
+                        mutex_unlock(&dev->mtx);
                         timeout = interruptible_sleep_on_timeout(&dev->write_wait, timeout);
-                        retval = down_interruptible(&dev->sem);
+                        retval = mutex_lock_interruptible(&dev->mtx);
                         if (retval) {
                                 retval = bytes_written ? bytes_written : retval;
                                 goto exit_nolock;
@@ -638,7 +641,7 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
 
 exit:
         /* unlock the device */
-        up(&dev->sem);
+        mutex_unlock(&dev->mtx);
 exit_nolock:
 
         dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
@@ -698,7 +701,7 @@ static int adu_probe(struct usb_interface *interface,
                 goto exit;
         }
 
-        init_MUTEX(&dev->sem);
+        mutex_init(&dev->mtx);
         spin_lock_init(&dev->buflock);
         dev->udev = udev;
         init_waitqueue_head(&dev->read_wait);
@@ -835,16 +838,16 @@ static void adu_disconnect(struct usb_interface *interface)
         usb_deregister_dev(interface, &adu_class);
         dev->minor = 0;
 
-        down(&dev->sem); /* not interruptible */
+        mutex_lock(&dev->mtx); /* not interruptible */
 
         /* if the device is not opened, then we clean up right now */
         dbg(2," %s : open count %d", __FUNCTION__, dev->open_count);
         if (!dev->open_count) {
-                up(&dev->sem);
+                mutex_unlock(&dev->mtx);
                 adu_delete(dev);
         } else {
                 dev->udev = NULL;
-                up(&dev->sem);
+                mutex_unlock(&dev->mtx);
         }
 
         dev_info(&interface->dev, "ADU device adutux%d now disconnected",
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index 4e88553e1666..1cb56f2d5c84 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -88,9 +88,10 @@ static void appledisplay_complete(struct urb *urb)
 {
         struct appledisplay *pdata = urb->context;
         unsigned long flags;
+        int status = urb->status;
         int retval;
 
-        switch (urb->status) {
+        switch (status) {
         case 0:
                 /* success */
                 break;
@@ -102,12 +103,12 @@ static void appledisplay_complete(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* This urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d",
-                        __FUNCTION__, urb->status);
+                dbg("%s - urb shuttingdown with status: %d",
+                        __FUNCTION__, status);
                 return;
         default:
                 dbg("%s - nonzero urb status received: %d",
-                        __FUNCTION__, urb->status);
+                        __FUNCTION__, status);
                 goto exit;
         }
 
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 1fd5fc220cd7..df7e1ecc810a 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -630,7 +630,7 @@ static int auerchain_start_wait_urb (pauerchain_t acp, struct urb *urb, int time
         } else
                 status = urb->status;
 
-        if (actual_length)
+        if (status >= 0)
                 *actual_length = urb->actual_length;
 
         return status;
@@ -664,7 +664,7 @@ static int auerchain_control_msg (pauerchain_t acp, struct usb_device *dev, unsi
         int ret;
         struct usb_ctrlrequest *dr;
         struct urb *urb;
-        int length;
+        int uninitialized_var(length);
 
         dbg ("auerchain_control_msg");
         dr = kmalloc (sizeof (struct usb_ctrlrequest), GFP_KERNEL);
@@ -862,14 +862,16 @@ static void auerswald_ctrlread_wretcomplete (struct urb * urb)
         pauerbuf_t bp = (pauerbuf_t) urb->context;
         pauerswald_t cp;
         int ret;
+        int status = urb->status;
+
         dbg ("auerswald_ctrlread_wretcomplete called");
-        dbg ("complete with status: %d", urb->status);
+        dbg ("complete with status: %d", status);
         cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl)));
 
         /* check if it is possible to advance */
-        if (!auerswald_status_retry (urb->status) || !cp->usbdev) {
+        if (!auerswald_status_retry(status) || !cp->usbdev) {
                 /* reuse the buffer */
-                err ("control dummy: transmission error %d, can not retry", urb->status);
+                err ("control dummy: transmission error %d, can not retry", status);
                 auerbuf_releasebuf (bp);
                 /* Wake up all processes waiting for a buffer */
                 wake_up (&cp->bufferwait);
@@ -902,21 +904,23 @@ static void auerswald_ctrlread_complete (struct urb * urb)
         pauerswald_t  cp;
         pauerscon_t   scp;
         pauerbuf_t    bp  = (pauerbuf_t) urb->context;
+        int status = urb->status;
         int ret;
+
         dbg ("auerswald_ctrlread_complete called");
 
         cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl)));
 
         /* check if there is valid data in this urb */
-        if (urb->status) {
-                dbg ("complete with non-zero status: %d", urb->status);
+        if (status) {
+                dbg ("complete with non-zero status: %d", status);
                 /* should we do a retry? */
-                if (!auerswald_status_retry (urb->status)
+                if (!auerswald_status_retry(status)
                  || !cp->usbdev
                  || (cp->version < AUV_RETRY)
                  || (bp->retries >= AU_RETRIES)) {
                         /* reuse the buffer */
-                        err ("control read: transmission error %d, can not retry", urb->status);
+                        err ("control read: transmission error %d, can not retry", status);
                         auerbuf_releasebuf (bp);
                         /* Wake up all processes waiting for a buffer */
                         wake_up (&cp->bufferwait);
@@ -974,12 +978,13 @@ static void auerswald_int_complete (struct urb * urb)
         unsigned  int channelid;
         unsigned  int bytecount;
         int ret;
+        int status = urb->status;
         pauerbuf_t   bp = NULL;
         pauerswald_t cp = (pauerswald_t) urb->context;
 
         dbg ("%s called", __FUNCTION__);
 
-        switch (urb->status) {
+        switch (status) {
         case 0:
                 /* success */
                 break;
@@ -987,10 +992,10 @@ static void auerswald_int_complete (struct urb * urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
+                dbg("%s - urb shutting down with status: %d", __FUNCTION__, status);
                 return;
         default:
-                dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
+                dbg("%s - nonzero urb status received: %d", __FUNCTION__, status);
                 goto exit;
         }
 
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index e0f122e131d7..538b535e955b 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -44,6 +44,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kref.h>
+#include <linux/mutex.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
 #include <linux/workqueue.h>
@@ -64,7 +65,7 @@ static struct workqueue_struct *respond_queue;
 * ftdi_module_lock exists to protect access to global variables
 *
 */
-static struct semaphore ftdi_module_lock;
+static struct mutex ftdi_module_lock;
 static int ftdi_instances = 0;
 static struct list_head ftdi_static_list;
 /*
@@ -199,10 +200,10 @@ static void ftdi_elan_delete(struct kref *kref)
         dev_warn(&ftdi->udev->dev, "FREEING ftdi=%p\n", ftdi);
         usb_put_dev(ftdi->udev);
         ftdi->disconnected += 1;
-        down(&ftdi_module_lock);
+        mutex_lock(&ftdi_module_lock);
         list_del_init(&ftdi->ftdi_list);
         ftdi_instances -= 1;
-        up(&ftdi_module_lock);
+        mutex_unlock(&ftdi_module_lock);
         kfree(ftdi->bulk_in_buffer);
         ftdi->bulk_in_buffer = NULL;
 }
@@ -746,10 +747,12 @@ static ssize_t ftdi_elan_read(struct file *file, char __user *buffer,
 static void ftdi_elan_write_bulk_callback(struct urb *urb)
 {
         struct usb_ftdi *ftdi = (struct usb_ftdi *)urb->context;
-        if (urb->status && !(urb->status == -ENOENT || urb->status ==
-                -ECONNRESET || urb->status == -ESHUTDOWN)) {
+        int status = urb->status;
+
+        if (status && !(status == -ENOENT || status == -ECONNRESET ||
+            status == -ESHUTDOWN)) {
                 dev_err(&ftdi->udev->dev, "urb=%p write bulk status received: %"
-                        "d\n", urb, urb->status);
+                        "d\n", urb, status);
         }
         usb_buffer_free(urb->dev, urb->transfer_buffer_length,
                 urb->transfer_buffer, urb->transfer_dma);
@@ -2780,10 +2783,10 @@ static int ftdi_elan_probe(struct usb_interface *interface,
                 return -ENOMEM;
         }
         memset(ftdi, 0x00, sizeof(struct usb_ftdi));
-        down(&ftdi_module_lock);
+        mutex_lock(&ftdi_module_lock);
         list_add_tail(&ftdi->ftdi_list, &ftdi_static_list);
         ftdi->sequence_num = ++ftdi_instances;
-        up(&ftdi_module_lock);
+        mutex_unlock(&ftdi_module_lock);
         ftdi_elan_init_kref(ftdi);
         init_MUTEX(&ftdi->sw_lock);
         ftdi->udev = usb_get_dev(interface_to_usbdev(interface));
@@ -2909,7 +2912,7 @@ static int __init ftdi_elan_init(void)
         int result;
         printk(KERN_INFO "driver %s built at %s on %s\n", ftdi_elan_driver.name,
                __TIME__, __DATE__);
-        init_MUTEX(&ftdi_module_lock);
+        mutex_init(&ftdi_module_lock);
         INIT_LIST_HEAD(&ftdi_static_list);
         status_queue = create_singlethread_workqueue("ftdi-status-control");
         if (!status_queue)
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index 28548d186712..46d9f27ec173 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -158,9 +158,10 @@ static void iowarrior_callback(struct urb *urb)
         int read_idx;
         int aux_idx;
         int offset;
-        int status;
+        int status = urb->status;
+        int retval;
 
-        switch (urb->status) {
+        switch (status) {
         case 0:
                 /* success */
                 break;
@@ -213,10 +214,10 @@ static void iowarrior_callback(struct urb *urb)
         wake_up_interruptible(&dev->read_wait);
 
 exit:
-        status = usb_submit_urb(urb, GFP_ATOMIC);
-        if (status)
+        retval = usb_submit_urb(urb, GFP_ATOMIC);
+        if (retval)
                 dev_err(&dev->interface->dev, "%s - usb_submit_urb failed with result %d",
-                        __FUNCTION__, status);
+                        __FUNCTION__, retval);
 
 }
 
@@ -226,13 +227,15 @@ exit:
 static void iowarrior_write_callback(struct urb *urb)
 {
         struct iowarrior *dev;
+        int status = urb->status;
+
         dev = (struct iowarrior *)urb->context;
         /* sync/async unlink faults aren't errors */
-        if (urb->status &&
-            !(urb->status == -ENOENT ||
-              urb->status == -ECONNRESET || urb->status == -ESHUTDOWN)) {
+        if (status &&
+            !(status == -ENOENT ||
+              status == -ECONNRESET || status == -ESHUTDOWN)) {
                 dbg("%s - nonzero write bulk status received: %d",
-                    __func__, urb->status);
+                    __func__, status);
         }
         /* free up our allocated buffer */
         usb_buffer_free(urb->dev, urb->transfer_buffer_length,
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 5e950b90c541..8208496dfc63 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -219,16 +219,17 @@ static void ld_usb_interrupt_in_callback(struct urb *urb)
         struct ld_usb *dev = urb->context;
         size_t *actual_buffer;
         unsigned int next_ring_head;
+        int status = urb->status;
         int retval;
 
-        if (urb->status) {
-                if (urb->status == -ENOENT ||
-                    urb->status == -ECONNRESET ||
-                    urb->status == -ESHUTDOWN) {
+        if (status) {
+                if (status == -ENOENT ||
+                    status == -ECONNRESET ||
+                    status == -ESHUTDOWN) {
                         goto exit;
                 } else {
                         dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n",
-                                 __FUNCTION__, urb->status);
+                                 __FUNCTION__, status);
                         spin_lock(&dev->rbsl);
                         goto resubmit; /* maybe we can recover */
                 }
@@ -275,14 +276,15 @@ exit:
 static void ld_usb_interrupt_out_callback(struct urb *urb)
 {
         struct ld_usb *dev = urb->context;
+        int status = urb->status;
 
         /* sync/async unlink faults aren't errors */
-        if (urb->status && !(urb->status == -ENOENT ||
-                             urb->status == -ECONNRESET ||
-                             urb->status == -ESHUTDOWN))
+        if (status && !(status == -ENOENT ||
+                        status == -ECONNRESET ||
+                        status == -ESHUTDOWN))
                 dbg_info(&dev->intf->dev,
                          "%s - nonzero write interrupt status received: %d\n",
-                         __FUNCTION__, urb->status);
+                         __FUNCTION__, status);
 
         dev->interrupt_out_busy = 0;
         wake_up_interruptible(&dev->write_wait);
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 2ed0daea894c..561970b889a5 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -742,19 +742,20 @@ exit:
 static void tower_interrupt_in_callback (struct urb *urb)
 {
         struct lego_usb_tower *dev = (struct lego_usb_tower *)urb->context;
+        int status = urb->status;
         int retval;
 
-        dbg(4, "%s: enter, status %d", __FUNCTION__, urb->status);
+        dbg(4, "%s: enter, status %d", __FUNCTION__, status);
 
         lego_usb_tower_debug_data(5, __FUNCTION__, urb->actual_length, urb->transfer_buffer);
 
-        if (urb->status) {
-                if (urb->status == -ENOENT ||
-                    urb->status == -ECONNRESET ||
-                    urb->status == -ESHUTDOWN) {
+        if (status) {
+                if (status == -ENOENT ||
+                    status == -ECONNRESET ||
+                    status == -ESHUTDOWN) {
                         goto exit;
                 } else {
-                        dbg(1, "%s: nonzero status received: %d", __FUNCTION__, urb->status);
+                        dbg(1, "%s: nonzero status received: %d", __FUNCTION__, status);
                         goto resubmit; /* maybe we can recover */
                 }
         }
@@ -788,7 +789,7 @@ exit:
         wake_up_interruptible (&dev->read_wait);
 
         lego_usb_tower_debug_data(5, __FUNCTION__, urb->actual_length, urb->transfer_buffer);
-        dbg(4, "%s: leave, status %d", __FUNCTION__, urb->status);
+        dbg(4, "%s: leave, status %d", __FUNCTION__, status);
 }
 
 
@@ -798,23 +799,24 @@ exit:
 static void tower_interrupt_out_callback (struct urb *urb)
 {
         struct lego_usb_tower *dev = (struct lego_usb_tower *)urb->context;
+        int status = urb->status;
 
-        dbg(4, "%s: enter, status %d", __FUNCTION__, urb->status);
+        dbg(4, "%s: enter, status %d", __FUNCTION__, status);
         lego_usb_tower_debug_data(5, __FUNCTION__, urb->actual_length, urb->transfer_buffer);
 
         /* sync/async unlink faults aren't errors */
-        if (urb->status && !(urb->status == -ENOENT ||
-                             urb->status == -ECONNRESET ||
-                             urb->status == -ESHUTDOWN)) {
+        if (status && !(status == -ENOENT ||
+                        status == -ECONNRESET ||
+                        status == -ESHUTDOWN)) {
                 dbg(1, "%s - nonzero write bulk status received: %d",
-                    __FUNCTION__, urb->status);
+                    __FUNCTION__, status);
         }
 
         dev->interrupt_out_busy = 0;
         wake_up_interruptible(&dev->write_wait);
 
         lego_usb_tower_debug_data(5, __FUNCTION__, urb->actual_length, urb->transfer_buffer);
-        dbg(4, "%s: leave, status %d", __FUNCTION__, urb->status);
+        dbg(4, "%s: leave, status %d", __FUNCTION__, status);
 }
 
 
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c
index 371bf2b1197d..aa9bcceabe74 100644
--- a/drivers/usb/misc/phidgetkit.c
+++ b/drivers/usb/misc/phidgetkit.c
@@ -305,9 +305,10 @@ static void interfacekit_irq(struct urb *urb)
         struct interfacekit *kit = urb->context;
         unsigned char *buffer = kit->data;
         int i, level, sensor;
-        int status;
+        int retval;
+        int status = urb->status;
 
-        switch (urb->status) {
+        switch (status) {
         case 0:                 /* success */
                 break;
         case -ECONNRESET:       /* unlink */
@@ -377,11 +378,11 @@ static void interfacekit_irq(struct urb *urb)
                 schedule_delayed_work(&kit->do_notify, 0);
 
 resubmit:
-        status = usb_submit_urb(urb, GFP_ATOMIC);
-        if (status)
-                err("can't resubmit intr, %s-%s/interfacekit0, status %d",
+        retval = usb_submit_urb(urb, GFP_ATOMIC);
+        if (retval)
+                err("can't resubmit intr, %s-%s/interfacekit0, retval %d",
                         kit->udev->bus->bus_name,
-                        kit->udev->devpath, status);
+                        kit->udev->devpath, retval);
 }
 
 static void do_notify(struct work_struct *work)
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c
index 5727e1ea2f91..df0ebcdb9d6a 100644
--- a/drivers/usb/misc/phidgetmotorcontrol.c
+++ b/drivers/usb/misc/phidgetmotorcontrol.c
@@ -95,9 +95,10 @@ static void motorcontrol_irq(struct urb *urb)
         struct motorcontrol *mc = urb->context;
         unsigned char *buffer = mc->data;
         int i, level;
-        int status;
+        int retval;
+        int status = urb->status;;
 
-        switch (urb->status) {
+        switch (status) {
         case 0:                 /* success */
                 break;
         case -ECONNRESET:       /* unlink */
@@ -151,12 +152,12 @@ static void motorcontrol_irq(struct urb *urb)
                 schedule_delayed_work(&mc->do_notify, 0);
 
 resubmit:
-        status = usb_submit_urb(urb, GFP_ATOMIC);
-        if (status)
+        retval = usb_submit_urb(urb, GFP_ATOMIC);
+        if (retval)
                 dev_err(&mc->intf->dev,
-                        "can't resubmit intr, %s-%s/motorcontrol0, status %d",
+                        "can't resubmit intr, %s-%s/motorcontrol0, retval %d",
                         mc->udev->bus->bus_name,
-                        mc->udev->devpath, status);
+                        mc->udev->devpath, retval);
 }
 
 static void do_notify(struct work_struct *work)
diff --git a/drivers/usb/misc/usblcd.c b/drivers/usb/misc/usblcd.c
index 504f7221b0d0..719842032712 100644
--- a/drivers/usb/misc/usblcd.c
+++ b/drivers/usb/misc/usblcd.c
@@ -176,16 +176,17 @@ static int lcd_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
 static void lcd_write_bulk_callback(struct urb *urb)
 {
         struct usb_lcd *dev;
+        int status = urb->status;
 
         dev = (struct usb_lcd *)urb->context;
 
         /* sync/async unlink faults aren't errors */
-        if (urb->status &&
-            !(urb->status == -ENOENT ||
-              urb->status == -ECONNRESET ||
-              urb->status == -ESHUTDOWN)) {
+        if (status &&
+            !(status == -ENOENT ||
+              status == -ECONNRESET ||
+              status == -ESHUTDOWN)) {
                 dbg("USBLCD: %s - nonzero write bulk status received: %d",
-                    __FUNCTION__, urb->status);
+                    __FUNCTION__, status);
         }
 
         /* free up our allocated buffer */
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index fb321864a92d..e901d31e051b 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -768,8 +768,8 @@ static void ctrl_complete (struct urb *urb)
 
                 /* some faults are allowed, not required */
                 if (subcase->expected > 0 && (
-                          ((urb->status == -subcase->expected   /* happened */
-                           || urb->status == 0))))              /* didn't */
+                          ((status == -subcase->expected        /* happened */
+                           || status == 0))))                   /* didn't */
                         status = 0;
                 /* sometimes more than one fault is allowed */
                 else if (subcase->number == 12 && status == -EPIPE)
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 1a60f9c473ad..2734fe2b9c43 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -111,12 +111,13 @@ static void async_complete(struct urb *urb)
         struct uss720_async_request *rq;
         struct parport *pp;
         struct parport_uss720_private *priv;
+        int status = urb->status;
 
         rq = urb->context;
         priv = rq->priv;
         pp = priv->pp;
-        if (urb->status) {
-                err("async_complete: urb error %d", urb->status);
+        if (status) {
+                err("async_complete: urb error %d", status);
         } else if (rq->dr.bRequest == 3) {
                 memcpy(priv->reg, rq->reg, sizeof(priv->reg));
 #if 0