summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-08-13 08:08:21 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-08-13 08:08:21 -0300
commiteff3a5b99dc445ed20b7fe512209d396a4310d04 (patch)
treed2eb8a64f28e1cd2b6a01a6c6fee608151669593
parent4a333c761138c420a88a5cca628dda451052631f (diff)
downloadmediapointer-dvb-s2-eff3a5b99dc445ed20b7fe512209d396a4310d04.tar.gz
mediapointer-dvb-s2-eff3a5b99dc445ed20b7fe512209d396a4310d04.tar.bz2
Initialize filp->private_data only once in em28xx_v4l2_open
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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index 566ef6994..21ca7809d 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -293,8 +293,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);