Commit b6854e3f authored by Miroslav Slugen's avatar Miroslav Slugen Committed by Mauro Carvalho Chehab

[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: default avatarMiroslav Slugen <thunder.mmm@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9ee8537f
...@@ -1573,8 +1573,8 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1573,8 +1573,8 @@ static const struct cx88_board cx88_boards[] = {
.name = "Pinnacle Hybrid PCTV", .name = "Pinnacle Hybrid PCTV",
.tuner_type = TUNER_XC2028, .tuner_type = TUNER_XC2028,
.tuner_addr = 0x61, .tuner_addr = 0x61,
.radio_type = TUNER_XC2028, .radio_type = UNSET,
.radio_addr = 0x61, .radio_addr = ADDR_UNSET,
.input = { { .input = { {
.type = CX88_VMUX_TELEVISION, .type = CX88_VMUX_TELEVISION,
.vmux = 0, .vmux = 0,
...@@ -1611,8 +1611,8 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1611,8 +1611,8 @@ static const struct cx88_board cx88_boards[] = {
.name = "Leadtek TV2000 XP Global", .name = "Leadtek TV2000 XP Global",
.tuner_type = TUNER_XC2028, .tuner_type = TUNER_XC2028,
.tuner_addr = 0x61, .tuner_addr = 0x61,
.radio_type = TUNER_XC2028, .radio_type = UNSET,
.radio_addr = 0x61, .radio_addr = ADDR_UNSET,
.input = { { .input = { {
.type = CX88_VMUX_TELEVISION, .type = CX88_VMUX_TELEVISION,
.vmux = 0, .vmux = 0,
...@@ -2115,8 +2115,8 @@ static const struct cx88_board cx88_boards[] = { ...@@ -2115,8 +2115,8 @@ static const struct cx88_board cx88_boards[] = {
.name = "Terratec Cinergy HT PCI MKII", .name = "Terratec Cinergy HT PCI MKII",
.tuner_type = TUNER_XC2028, .tuner_type = TUNER_XC2028,
.tuner_addr = 0x61, .tuner_addr = 0x61,
.radio_type = TUNER_XC2028, .radio_type = UNSET,
.radio_addr = 0x61, .radio_addr = ADDR_UNSET,
.input = { { .input = { {
.type = CX88_VMUX_TELEVISION, .type = CX88_VMUX_TELEVISION,
.vmux = 0, .vmux = 0,
...@@ -2154,9 +2154,9 @@ static const struct cx88_board cx88_boards[] = { ...@@ -2154,9 +2154,9 @@ static const struct cx88_board cx88_boards[] = {
[CX88_BOARD_WINFAST_DTV1800H] = { [CX88_BOARD_WINFAST_DTV1800H] = {
.name = "Leadtek WinFast DTV1800 Hybrid", .name = "Leadtek WinFast DTV1800 Hybrid",
.tuner_type = TUNER_XC2028, .tuner_type = TUNER_XC2028,
.radio_type = TUNER_XC2028, .radio_type = UNSET,
.tuner_addr = 0x61, .tuner_addr = 0x61,
.radio_addr = 0x61, .radio_addr = ADDR_UNSET,
/* /*
* GPIO setting * GPIO setting
* *
...@@ -2195,9 +2195,9 @@ static const struct cx88_board cx88_boards[] = { ...@@ -2195,9 +2195,9 @@ static const struct cx88_board cx88_boards[] = {
[CX88_BOARD_WINFAST_DTV1800H_XC4000] = { [CX88_BOARD_WINFAST_DTV1800H_XC4000] = {
.name = "Leadtek WinFast DTV1800 H (XC4000)", .name = "Leadtek WinFast DTV1800 H (XC4000)",
.tuner_type = TUNER_XC4000, .tuner_type = TUNER_XC4000,
.radio_type = TUNER_XC4000, .radio_type = UNSET,
.tuner_addr = 0x61, .tuner_addr = 0x61,
.radio_addr = 0x61, .radio_addr = ADDR_UNSET,
/* /*
* GPIO setting * GPIO setting
* *
...@@ -2236,9 +2236,9 @@ static const struct cx88_board cx88_boards[] = { ...@@ -2236,9 +2236,9 @@ static const struct cx88_board cx88_boards[] = {
[CX88_BOARD_WINFAST_DTV2000H_PLUS] = { [CX88_BOARD_WINFAST_DTV2000H_PLUS] = {
.name = "Leadtek WinFast DTV2000 H PLUS", .name = "Leadtek WinFast DTV2000 H PLUS",
.tuner_type = TUNER_XC4000, .tuner_type = TUNER_XC4000,
.radio_type = TUNER_XC4000, .radio_type = UNSET,
.tuner_addr = 0x61, .tuner_addr = 0x61,
.radio_addr = 0x61, .radio_addr = ADDR_UNSET,
/* /*
* GPIO * GPIO
* 2: 1: mute audio * 2: 1: mute audio
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment