From aa93beda78456b2dc3404cfce3d55234677ffedc Mon Sep 17 00:00:00 2001 From: Hartmut Hackmann Date: Tue, 3 Oct 2006 02:00:32 +0200 Subject: SAA713x: fixed compile warning in SECAM fixup From: Hartmut Hackmann The variable fixup could be used uninitialized. Signed-off-by: Hartmut Hackmann --- linux/drivers/media/video/saa7134/saa7134-video.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 4e3d73089..ca42682f9 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1828,15 +1828,18 @@ static int video_do_ioctl(struct inode *inode, struct file *file, break; if (i == TVNORMS) return -EINVAL; - if (*id & V4L2_STD_SECAM) { - if (secam[0] == 'L' || secam[0] == 'l') + if ((*id & V4L2_STD_SECAM) && (secam[0] != '-')) { + if (secam[0] == 'L' || secam[0] == 'l') { if (secam[1] == 'C' || secam[1] == 'c') fixup = V4L2_STD_SECAM_LC; else fixup = V4L2_STD_SECAM_L; - else + } else { if (secam[0] == 'D' || secam[0] == 'd') fixup = V4L2_STD_SECAM_DK; + else + fixup = V4L2_STD_SECAM; + } for (i = 0; i < TVNORMS; i++) if (fixup == tvnorms[i].id) break; -- cgit v1.2.3