From 2e1d5cf1cb001782afec2a630a2b651894f62e80 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Sun, 5 Jul 2009 14:06:41 -0300
Subject: [PATCH] --- yaml --- r: 154951 b: refs/heads/master c:
 11b79ea75ada39b7f1efdebdad520c93c3ac1f0e h: refs/heads/master i:   154949:
 17fe39289808bc4430c83e08266c9f3f715ab316   154947:
 457db84241b5b9a6159e9a6ecbefe98f8ba0afff   154943:
 2a5cd22cb4a1b6af48be7301d0fccc129ce2a822 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index acffec8262ec..8a02fc7eeb2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 791a08fc01aaa293a73c9dce260327fdee288faf
+refs/heads/master: 11b79ea75ada39b7f1efdebdad520c93c3ac1f0e
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 8366c521921d..ebd24a25fb85 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -2652,6 +2652,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
 	retval = em28xx_init_dev(&dev, udev, interface, nr);
 	if (retval) {
 		em28xx_devused &= ~(1<<dev->devno);
+		mutex_unlock(&dev->lock);
 		kfree(dev);
 		goto err;
 	}