]> err.no Git - linux-2.6/commitdiff
V4L/DVB (6005): Initialize filp->private_data only once in em28xx_v4l2_open
authorRolf Eike Beer <eike-kernel@sf-tec.de>
Mon, 13 Aug 2007 11:08:21 +0000 (08:08 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 10 Oct 2007 01:05:00 +0000 (22:05 -0300)
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>
drivers/media/video/em28xx/em28xx-video.c

index 40307f3f6fe31118be769ecf2103873c86ead2ec..e4fba906833628b5984c139734fa8b7d8ce6dbb6 100644 (file)
@@ -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);