Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel

2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 7b6922e08ed1..203526542013 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -376,7 +376,7 @@ static int adu_release(struct inode *inode, struct file *file)
         if (dev->open_count <= 0) {
                 dbg(1," %s : device not opened", __func__);
                 retval = -ENODEV;
-                goto exit;
+                goto unlock;
         }
 
         adu_release_internal(dev);
@@ -385,9 +385,9 @@ static int adu_release(struct inode *inode, struct file *file)
                 if (!dev->open_count)   /* ... and we're the last user */
                         adu_delete(dev);
         }
-
-exit:
+unlock:
         mutex_unlock(&adutux_mutex);
+exit:
         dbg(2," %s : leave, return value %d", __func__, retval);
         return retval;
 }
diff --git a/drivers/usb/misc/vstusb.c b/drivers/usb/misc/vstusb.c
index 63dff9ba73c5..f26ea8dc1577 100644
--- a/drivers/usb/misc/vstusb.c
+++ b/drivers/usb/misc/vstusb.c
@@ -401,6 +401,7 @@ static ssize_t vstusb_write(struct file *file, const char __user *buffer,
         }
 
         if (copy_from_user(buf, buffer, count)) {
+                mutex_unlock(&vstdev->lock);
                 dev_err(&dev->dev, "%s: can't copy_from_user\n", __func__);
                 retval = -EFAULT;
                 goto exit;