From: Rolf Eike Beer <eike-kernel@sf-tec.de>
Date: Mon, 13 Aug 2007 11:08:21 +0000 (-0300)
Subject: V4L/DVB (6005): Initialize filp->private_data only once in em28xx_v4l2_open
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=afa76b392e10d37c9e717198b5c2686de26c629d;p=linux-beck.git

V4L/DVB (6005): Initialize filp->private_data only once in em28xx_v4l2_open

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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 40307f3f6fe3..e4fba9068336 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -268,8 +268,6 @@ static int em28xx_v4l2_open(struct inode *inode, struct file *filp)
 	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);