summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-09-13 13:26:03 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-13 13:26:03 -0300
commitbed385df30ae7d5ad768d8c3913de26b62d97930 (patch)
tree1aae8c5e734244ede1938194c6e6ec917ea66011 /linux/drivers/media
parent0b8c00434bd885aefcf8d76a532e0599ae0a270b (diff)
downloadmediapointer-dvb-s2-bed385df30ae7d5ad768d8c3913de26b62d97930.tar.gz
mediapointer-dvb-s2-bed385df30ae7d5ad768d8c3913de26b62d97930.tar.bz2
Vivi crashes with mplayer
From: Sascha Hauer <s.hauer@pengutronix.de> The vivi.current_norm field is not initialized in vivi.c, so a VIDIOC_G_STD ioctl without a prior call to VIDIOC_S_STD gives unpredictable results. mplayer does exactly this. Signed-off-by Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/vivi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c
index 14af7b90f..b907f6f23 100644
--- a/linux/drivers/media/video/vivi.c
+++ b/linux/drivers/media/video/vivi.c
@@ -1442,6 +1442,8 @@ static int __init vivi_init(void)
dev->vidq.timeout.data = (unsigned long)dev;
init_timer(&dev->vidq.timeout);
+ vivi.current_norm = tvnorms[0].id;
+
ret = video_register_device(&vivi, VFL_TYPE_GRABBER, video_nr);
printk(KERN_INFO "Video Technology Magazine Virtual Video Capture Board (Load status: %d)\n", ret);
return ret;