diff options
| author | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2006-10-02 21:00:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-04 08:06:00 -0300 |
| commit | 9448025be057f6b64c4bab01894c8e6b1a406e6e (patch) | |
| tree | 5a0a8b27c452fe105e83e7ffcd8fdb4169fc0150 /drivers/media | |
| parent | cf146ca4c2d56f275235526d9ada6c007313c7c7 (diff) | |
| download | kernel-crypto-9448025be057f6b64c4bab01894c8e6b1a406e6e.tar.gz kernel-crypto-9448025be057f6b64c4bab01894c8e6b1a406e6e.tar.xz kernel-crypto-9448025be057f6b64c4bab01894c8e6b1a406e6e.zip | |
V4L/DVB (4704): SAA713x: fixed compile warning in SECAM fixup
The variable fixup could be used uninitialized.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 557530aef94..203302f2182 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c @@ -1820,15 +1820,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; |