diff options
Diffstat (limited to 'drivers/media/video/tuner-core.c')
-rw-r--r-- | drivers/media/video/tuner-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 406b85cd606..4369f6d1249 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | /* standard i2c insmod options */ | 26 | /* standard i2c insmod options */ |
27 | static unsigned short normal_i2c[] = { | 27 | static unsigned short normal_i2c[] = { |
28 | #ifdef CONFIG_TUNER_5761 | 28 | #ifdef CONFIG_TUNER_TEA5761 |
29 | 0x10, | 29 | 0x10, |
30 | #endif | 30 | #endif |
31 | 0x42, 0x43, 0x4a, 0x4b, /* tda8290 */ | 31 | 0x42, 0x43, 0x4a, 0x4b, /* tda8290 */ |
@@ -195,12 +195,12 @@ static void set_type(struct i2c_client *c, unsigned int type, | |||
195 | } | 195 | } |
196 | t->mode_mask = T_RADIO; | 196 | t->mode_mask = T_RADIO; |
197 | break; | 197 | break; |
198 | #ifdef CONFIG_TUNER_5761 | 198 | #ifdef CONFIG_TUNER_TEA5761 |
199 | case TUNER_TEA5761: | 199 | case TUNER_TEA5761: |
200 | if (tea5761_tuner_init(c) == EINVAL) { | 200 | if (tea5761_tuner_init(c) == EINVAL) { |
201 | t->type = TUNER_ABSENT; | 201 | t->type = TUNER_ABSENT; |
202 | t->mode_mask = T_UNINITIALIZED; | 202 | t->mode_mask = T_UNINITIALIZED; |
203 | return -ENODEV; | 203 | return; |
204 | } | 204 | } |
205 | t->mode_mask = T_RADIO; | 205 | t->mode_mask = T_RADIO; |
206 | break; | 206 | break; |
@@ -475,7 +475,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) | |||
475 | /* autodetection code based on the i2c addr */ | 475 | /* autodetection code based on the i2c addr */ |
476 | if (!no_autodetect) { | 476 | if (!no_autodetect) { |
477 | switch (addr) { | 477 | switch (addr) { |
478 | #ifdef CONFIG_TUNER_5761 | 478 | #ifdef CONFIG_TUNER_TEA5761 |
479 | case 0x10: | 479 | case 0x10: |
480 | if (tea5761_autodetection(&t->i2c) != EINVAL) { | 480 | if (tea5761_autodetection(&t->i2c) != EINVAL) { |
481 | t->type = TUNER_TEA5761; | 481 | t->type = TUNER_TEA5761; |