From: Rolf Eike Beer <eike-kernel@sf-tec.de>

Some lines later filp->private_data is initialized to dev again.  Since there
are some checks that might fail in the mean time keep the later version.

Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/media/video/em28xx/em28xx-video.c |    2 --
 1 files changed, 2 deletions(-)

diff -puN drivers/media/video/em28xx/em28xx-video.c~initialize-filp-private_data-only-once-in-em28xx_v4l2_open drivers/media/video/em28xx/em28xx-video.c
--- a/drivers/media/video/em28xx/em28xx-video.c~initialize-filp-private_data-only-once-in-em28xx_v4l2_open
+++ a/drivers/media/video/em28xx/em28xx-video.c
@@ -268,8 +268,6 @@ static int em28xx_v4l2_open(struct inode
 	if (NULL == dev)
 		return -ENODEV;
 
-	filp->private_data=dev;
-
 	em28xx_videodbg("open minor=%d type=%s users=%d\n",
 				minor,v4l2_type_names[dev->type],dev->users);
 
_