From ed257478fa3c3eefcea16959a23f46b91db9f286 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 14 Aug 2012 02:58:15 -0300
Subject: [PATCH] --- yaml --- r: 330880 b: refs/heads/master c:
 e36c92fd63bb4773e6f4bc38ecee11a609ded1cf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a9769df4d718..7519033af45d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5359805193dc83e1aab2f8e230d57c649363c5c5
+refs/heads/master: e36c92fd63bb4773e6f4bc38ecee11a609ded1cf
diff --git a/trunk/drivers/media/usb/em28xx/em28xx-video.c b/trunk/drivers/media/usb/em28xx/em28xx-video.c
index ecb23df7f16e..78d6ebd712b9 100644
--- a/trunk/drivers/media/usb/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/usb/em28xx/em28xx-video.c
@@ -2264,9 +2264,9 @@ static int em28xx_v4l2_close(struct file *filp)
 		if (dev->state & DEV_DISCONNECTED) {
 			em28xx_release_resources(dev);
 			kfree(dev->alt_max_pkt_size);
+			mutex_unlock(&dev->lock);
 			kfree(dev);
 			kfree(fh);
-			mutex_unlock(&dev->lock);
 			return 0;
 		}