From 122388f8c5b70e1d165b3295443580090d1163e5 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 12 Dec 2007 18:25:23 -0300
Subject: [PATCH] --- yaml --- r: 76581 b: refs/heads/master c:
 544e6175330c86ad87abeeb1b048f56bafd96c31 h: refs/heads/master i:   76579:
 2782f64ba24b8cfeaffa9c3542bea4d16ea17023 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/media/video/usbvision/usbvision-video.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 017d5cc705b2..81d7997a2392 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0991112c1c4625323df8a582de1b2f8609922248
+refs/heads/master: 544e6175330c86ad87abeeb1b048f56bafd96c31
diff --git a/trunk/drivers/media/video/usbvision/usbvision-video.c b/trunk/drivers/media/video/usbvision/usbvision-video.c
index d929ced58ec3..92e72910792b 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-video.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-video.c
@@ -1290,8 +1290,8 @@ static int usbvision_radio_open(struct inode *inode, struct file *file)
 		errCode = usbvision_set_alternate(usbvision);
 		if (errCode < 0) {
 			usbvision->last_error = errCode;
-			mutex_unlock(&usbvision->lock);
-			return -EBUSY;
+			errCode = -EBUSY;
+			goto out;
 		}
 
 		// If so far no errors then we shall start the radio
@@ -1308,6 +1308,7 @@ static int usbvision_radio_open(struct inode *inode, struct file *file)
 			usbvision->initialized = 0;
 		}
 	}
+out:
 	mutex_unlock(&usbvision->lock);
 	return errCode;
 }