tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by Hartmut Hackmann and committed by Mauro Carvalho Chehab 9448025b cf146ca4

+6 -3
unified split
+6 -3
drivers/media/video/saa7134/saa7134-video.c
··· 1820 break; 1821 if (i == TVNORMS) 1822 return -EINVAL; 1823 - if (*id & V4L2_STD_SECAM) { 1824 - if (secam[0] == 'L' || secam[0] == 'l') 1825 if (secam[1] == 'C' || secam[1] == 'c') 1826 fixup = V4L2_STD_SECAM_LC; 1827 else 1828 fixup = V4L2_STD_SECAM_L; 1829 - else 1830 if (secam[0] == 'D' || secam[0] == 'd') 1831 fixup = V4L2_STD_SECAM_DK; 1832 for (i = 0; i < TVNORMS; i++) 1833 if (fixup == tvnorms[i].id) 1834 break;
··· 1820 break; 1821 if (i == TVNORMS) 1822 return -EINVAL; 1823 + if ((*id & V4L2_STD_SECAM) && (secam[0] != '-')) { 1824 + if (secam[0] == 'L' || secam[0] == 'l') { 1825 if (secam[1] == 'C' || secam[1] == 'c') 1826 fixup = V4L2_STD_SECAM_LC; 1827 else 1828 fixup = V4L2_STD_SECAM_L; 1829 + } else { 1830 if (secam[0] == 'D' || secam[0] == 'd') 1831 fixup = V4L2_STD_SECAM_DK; 1832 + else 1833 + fixup = V4L2_STD_SECAM; 1834 + } 1835 for (i = 0; i < TVNORMS; i++) 1836 if (fixup == tvnorms[i].id) 1837 break;