diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-06-05 08:22:00 (GMT) |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 17:23:53 (GMT) |
commit | 9ee476a56c3ee119a02b6823659f5698b1241f04 (patch) | |
tree | b4ef6519bd302155fca354fd505981f5d1565deb /drivers | |
parent | 0c71bf1c3065e80cc3ab91293829169bdeda2c42 (diff) | |
download | linux-fsl-qoriq-9ee476a56c3ee119a02b6823659f5698b1241f04.tar.xz |
V4L/DVB (5740): Git-dvb: fix the tea5761 tuner support
Due to a typo the tea5761 tuner support was dead code.
This patch also fixes a bug in the no longer dead code:
A void function can't return anything.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-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 406b85c..4369f6d 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c @@ -25,7 +25,7 @@ /* standard i2c insmod options */ static unsigned short normal_i2c[] = { -#ifdef CONFIG_TUNER_5761 +#ifdef CONFIG_TUNER_TEA5761 0x10, #endif 0x42, 0x43, 0x4a, 0x4b, /* tda8290 */ @@ -195,12 +195,12 @@ static void set_type(struct i2c_client *c, unsigned int type, } t->mode_mask = T_RADIO; break; -#ifdef CONFIG_TUNER_5761 +#ifdef CONFIG_TUNER_TEA5761 case TUNER_TEA5761: if (tea5761_tuner_init(c) == EINVAL) { t->type = TUNER_ABSENT; t->mode_mask = T_UNINITIALIZED; - return -ENODEV; + return; } t->mode_mask = T_RADIO; break; @@ -475,7 +475,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) /* autodetection code based on the i2c addr */ if (!no_autodetect) { switch (addr) { -#ifdef CONFIG_TUNER_5761 +#ifdef CONFIG_TUNER_TEA5761 case 0x10: if (tea5761_autodetection(&t->i2c) != EINVAL) { t->type = TUNER_TEA5761; |