aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMiroslav Slugen <thunder.mmm@gmail.com>2011-12-11 18:19:34 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-16 08:55:12 -0500
commit9ee8537f60590c63d74dc5724c921bc3eb6ef558 (patch)
tree4d1f4fa9b3cb41f626982abfdb717539b6534044 /drivers/media
parenta7c8aadad39428b64d26c3971d967f8314e2397d (diff)
[media] cx23885: Don't duplicate xc4000 entry for radio
All radio tuners in cx23885 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. Be aware radio support in cx23885 is not yet committed, so this is only minor fix for future support. Signed-off-by: Miroslav Slugen <thunder.mmm@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 3c01be999e35..19b5499d2624 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -213,8 +213,8 @@ struct cx23885_board cx23885_boards[] = {
213 .portc = CX23885_MPEG_DVB, 213 .portc = CX23885_MPEG_DVB,
214 .tuner_type = TUNER_XC4000, 214 .tuner_type = TUNER_XC4000,
215 .tuner_addr = 0x61, 215 .tuner_addr = 0x61,
216 .radio_type = TUNER_XC4000, 216 .radio_type = UNSET,
217 .radio_addr = 0x61, 217 .radio_addr = ADDR_UNSET,
218 .input = {{ 218 .input = {{
219 .type = CX23885_VMUX_TELEVISION, 219 .type = CX23885_VMUX_TELEVISION,
220 .vmux = CX25840_VIN2_CH1 | 220 .vmux = CX25840_VIN2_CH1 |