Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9ee476a56c3ee119a02b6823659f5698b1241f04
Commit:     9ee476a56c3ee119a02b6823659f5698b1241f04
Parent:     0c71bf1c3065e80cc3ab91293829169bdeda2c42
Author:     Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Tue Jun 5 05:22:00 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Wed Jul 18 14:23:53 2007 -0300

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to