aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorRolf Eike Beer <eike-kernel@sf-tec.de>2007-08-13 07:08:21 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:05:00 -0400
commitafa76b392e10d37c9e717198b5c2686de26c629d (patch)
tree532cc49110321458e1c1d59c7b4c36a5493dfc29 /drivers/media/video
parentbe848fe39a656fd57429263f5ac8c656ccdff362 (diff)
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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c2
1 files changed, 0 insertions, 2 deletions
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)
268 if (NULL == dev) 268 if (NULL == dev)
269 return -ENODEV; 269 return -ENODEV;
270 270
271 filp->private_data=dev;
272
273 em28xx_videodbg("open minor=%d type=%s users=%d\n", 271 em28xx_videodbg("open minor=%d type=%s users=%d\n",
274 minor,v4l2_type_names[dev->type],dev->users); 272 minor,v4l2_type_names[dev->type],dev->users);
275 273