diff options
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0110-cx88-fix-don-t-duplicate-xc4000-entry-for-radio.patch')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0110-cx88-fix-don-t-duplicate-xc4000-entry-for-radio.patch | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0110-cx88-fix-don-t-duplicate-xc4000-entry-for-radio.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0110-cx88-fix-don-t-duplicate-xc4000-entry-for-radio.patch new file mode 100644 index 00000000..20dd5ecf --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0110-cx88-fix-don-t-duplicate-xc4000-entry-for-radio.patch | |||
@@ -0,0 +1,95 @@ | |||
1 | From 62b69534abbda46006d5372502ae08e2df541e58 Mon Sep 17 00:00:00 2001 | ||
2 | From: Miroslav Slugen <thunder.mmm@gmail.com> | ||
3 | Date: Sun, 11 Dec 2011 19:00:06 -0300 | ||
4 | Subject: [PATCH 110/130] cx88: fix: don't duplicate xc4000 entry for radio | ||
5 | |||
6 | commit b6854e3f31402476bcc9d2f41570389fa491de17 upstream. | ||
7 | |||
8 | All radio tuners in cx88 driver using same address for radio and tuner, | ||
9 | so there is no need to probe it twice for same tuner and we can use | ||
10 | radio_type UNSET, this also fix broken radio since kernel 2.6.39-rc1 | ||
11 | for those tuners. | ||
12 | |||
13 | Signed-off-by: Miroslav Slugen <thunder.mmm@gmail.com> | ||
14 | Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> | ||
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | ||
16 | --- | ||
17 | drivers/media/video/cx88/cx88-cards.c | 24 ++++++++++++------------ | ||
18 | 1 files changed, 12 insertions(+), 12 deletions(-) | ||
19 | |||
20 | diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c | ||
21 | index 0d719fa..3929d93 100644 | ||
22 | --- a/drivers/media/video/cx88/cx88-cards.c | ||
23 | +++ b/drivers/media/video/cx88/cx88-cards.c | ||
24 | @@ -1573,8 +1573,8 @@ static const struct cx88_board cx88_boards[] = { | ||
25 | .name = "Pinnacle Hybrid PCTV", | ||
26 | .tuner_type = TUNER_XC2028, | ||
27 | .tuner_addr = 0x61, | ||
28 | - .radio_type = TUNER_XC2028, | ||
29 | - .radio_addr = 0x61, | ||
30 | + .radio_type = UNSET, | ||
31 | + .radio_addr = ADDR_UNSET, | ||
32 | .input = { { | ||
33 | .type = CX88_VMUX_TELEVISION, | ||
34 | .vmux = 0, | ||
35 | @@ -1611,8 +1611,8 @@ static const struct cx88_board cx88_boards[] = { | ||
36 | .name = "Leadtek TV2000 XP Global", | ||
37 | .tuner_type = TUNER_XC2028, | ||
38 | .tuner_addr = 0x61, | ||
39 | - .radio_type = TUNER_XC2028, | ||
40 | - .radio_addr = 0x61, | ||
41 | + .radio_type = UNSET, | ||
42 | + .radio_addr = ADDR_UNSET, | ||
43 | .input = { { | ||
44 | .type = CX88_VMUX_TELEVISION, | ||
45 | .vmux = 0, | ||
46 | @@ -2043,8 +2043,8 @@ static const struct cx88_board cx88_boards[] = { | ||
47 | .name = "Terratec Cinergy HT PCI MKII", | ||
48 | .tuner_type = TUNER_XC2028, | ||
49 | .tuner_addr = 0x61, | ||
50 | - .radio_type = TUNER_XC2028, | ||
51 | - .radio_addr = 0x61, | ||
52 | + .radio_type = UNSET, | ||
53 | + .radio_addr = ADDR_UNSET, | ||
54 | .input = { { | ||
55 | .type = CX88_VMUX_TELEVISION, | ||
56 | .vmux = 0, | ||
57 | @@ -2082,9 +2082,9 @@ static const struct cx88_board cx88_boards[] = { | ||
58 | [CX88_BOARD_WINFAST_DTV1800H] = { | ||
59 | .name = "Leadtek WinFast DTV1800 Hybrid", | ||
60 | .tuner_type = TUNER_XC2028, | ||
61 | - .radio_type = TUNER_XC2028, | ||
62 | + .radio_type = UNSET, | ||
63 | .tuner_addr = 0x61, | ||
64 | - .radio_addr = 0x61, | ||
65 | + .radio_addr = ADDR_UNSET, | ||
66 | /* | ||
67 | * GPIO setting | ||
68 | * | ||
69 | @@ -2123,9 +2123,9 @@ static const struct cx88_board cx88_boards[] = { | ||
70 | [CX88_BOARD_WINFAST_DTV1800H_XC4000] = { | ||
71 | .name = "Leadtek WinFast DTV1800 H (XC4000)", | ||
72 | .tuner_type = TUNER_XC4000, | ||
73 | - .radio_type = TUNER_XC4000, | ||
74 | + .radio_type = UNSET, | ||
75 | .tuner_addr = 0x61, | ||
76 | - .radio_addr = 0x61, | ||
77 | + .radio_addr = ADDR_UNSET, | ||
78 | /* | ||
79 | * GPIO setting | ||
80 | * | ||
81 | @@ -2164,9 +2164,9 @@ static const struct cx88_board cx88_boards[] = { | ||
82 | [CX88_BOARD_WINFAST_DTV2000H_PLUS] = { | ||
83 | .name = "Leadtek WinFast DTV2000 H PLUS", | ||
84 | .tuner_type = TUNER_XC4000, | ||
85 | - .radio_type = TUNER_XC4000, | ||
86 | + .radio_type = UNSET, | ||
87 | .tuner_addr = 0x61, | ||
88 | - .radio_addr = 0x61, | ||
89 | + .radio_addr = ADDR_UNSET, | ||
90 | /* | ||
91 | * GPIO | ||
92 | * 2: 1: mute audio | ||
93 | -- | ||
94 | 1.7.7.4 | ||
95 | |||