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

[media] cx88: fix: don't duplicate xc4000 entry for radio

All radio tuners in cx88 driver using same address for radio and tuner,
so there is no need to probe it twice for same tuner and we can use
radio_type UNSET, this also fix broken radio since kernel 2.6.39-rc1
for those tuners.

Cc: stable@kernel.org
Signed-off-by: Miroslav Slugen <thunder.mmm@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Miroslav Slugen and committed by
Mauro Carvalho Chehab b6854e3f 9ee8537f

+12 -12
+12 -12
drivers/media/video/cx88/cx88-cards.c
··· 1573 1573 .name = "Pinnacle Hybrid PCTV", 1574 1574 .tuner_type = TUNER_XC2028, 1575 1575 .tuner_addr = 0x61, 1576 - .radio_type = TUNER_XC2028, 1577 - .radio_addr = 0x61, 1576 + .radio_type = UNSET, 1577 + .radio_addr = ADDR_UNSET, 1578 1578 .input = { { 1579 1579 .type = CX88_VMUX_TELEVISION, 1580 1580 .vmux = 0, ··· 1611 1611 .name = "Leadtek TV2000 XP Global", 1612 1612 .tuner_type = TUNER_XC2028, 1613 1613 .tuner_addr = 0x61, 1614 - .radio_type = TUNER_XC2028, 1615 - .radio_addr = 0x61, 1614 + .radio_type = UNSET, 1615 + .radio_addr = ADDR_UNSET, 1616 1616 .input = { { 1617 1617 .type = CX88_VMUX_TELEVISION, 1618 1618 .vmux = 0, ··· 2115 2115 .name = "Terratec Cinergy HT PCI MKII", 2116 2116 .tuner_type = TUNER_XC2028, 2117 2117 .tuner_addr = 0x61, 2118 - .radio_type = TUNER_XC2028, 2119 - .radio_addr = 0x61, 2118 + .radio_type = UNSET, 2119 + .radio_addr = ADDR_UNSET, 2120 2120 .input = { { 2121 2121 .type = CX88_VMUX_TELEVISION, 2122 2122 .vmux = 0, ··· 2154 2154 [CX88_BOARD_WINFAST_DTV1800H] = { 2155 2155 .name = "Leadtek WinFast DTV1800 Hybrid", 2156 2156 .tuner_type = TUNER_XC2028, 2157 - .radio_type = TUNER_XC2028, 2157 + .radio_type = UNSET, 2158 2158 .tuner_addr = 0x61, 2159 - .radio_addr = 0x61, 2159 + .radio_addr = ADDR_UNSET, 2160 2160 /* 2161 2161 * GPIO setting 2162 2162 * ··· 2195 2195 [CX88_BOARD_WINFAST_DTV1800H_XC4000] = { 2196 2196 .name = "Leadtek WinFast DTV1800 H (XC4000)", 2197 2197 .tuner_type = TUNER_XC4000, 2198 - .radio_type = TUNER_XC4000, 2198 + .radio_type = UNSET, 2199 2199 .tuner_addr = 0x61, 2200 - .radio_addr = 0x61, 2200 + .radio_addr = ADDR_UNSET, 2201 2201 /* 2202 2202 * GPIO setting 2203 2203 * ··· 2236 2236 [CX88_BOARD_WINFAST_DTV2000H_PLUS] = { 2237 2237 .name = "Leadtek WinFast DTV2000 H PLUS", 2238 2238 .tuner_type = TUNER_XC4000, 2239 - .radio_type = TUNER_XC4000, 2239 + .radio_type = UNSET, 2240 2240 .tuner_addr = 0x61, 2241 - .radio_addr = 0x61, 2241 + .radio_addr = ADDR_UNSET, 2242 2242 /* 2243 2243 * GPIO 2244 2244 * 2: 1: mute audio