diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2006-09-13 13:26:03 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 12:30:36 -0300 |
commit | d7fbefe06d2061de126095f903359ce1ef61faf3 (patch) | |
tree | 42da9dcd05563bc73624d16ca670cdca7fc03590 | |
parent | 183d896a03e1f0e4ab69d75f123d33a62b47cf03 (diff) | |
download | kernel-crypto-d7fbefe06d2061de126095f903359ce1ef61faf3.tar.gz kernel-crypto-d7fbefe06d2061de126095f903359ce1ef61faf3.tar.xz kernel-crypto-d7fbefe06d2061de126095f903359ce1ef61faf3.zip |
V4L/DVB (4627): Vivi crashes with mplayer
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>
-rw-r--r-- | drivers/media/video/vivi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 06b44e1dda1..e7c01d560b6 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -1360,6 +1360,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; |