diff --git a/[refs] b/[refs]
index d0aad3d96c8a..9d7d82b6cf86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c75541fc97252e605b7bc8f9b09f816483e22fb
+refs/heads/master: 86bb4a215d152111f20daeb2a530f064afee8542
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index daa4387a2296..16a6d2da7391 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -357,20 +357,10 @@ static void em2820_release_resources(struct em2820 *dev)
  * em2820_v4l2_close()
  * stops streaming and deallocates all resources allocated by the v4l2 calls and ioctls
  */
-static int em2820_v4l2_close(struct inode *inode, struct file *file)
+static int em2820_v4l2_close(struct inode *inode, struct file *filp)
 {
 	int errCode;
-	int minor = iminor(inode);
-	struct em2820 *h,*dev = NULL;
-	struct list_head *list;
-
-	list_for_each(list,&em2820_devlist) {
-		h = list_entry(list, struct em2820, devlist);
-		if (h->vdev->minor == minor) {
-			dev  = h;
-		}
-	}
-
+	struct em2820 *dev=filp->private_data;
 
 	em2820_videodbg("users=%d", dev->users);