[PATCH] Tuner bugfix

From: Neal Stephenson <neal@bakerst.org>

In 2.6.2, I noticed that my modprobe.conf line for tuner "options tuner
type=2" no longer worked.  It even failed with insmod "insmod tuner.ko
type=2".  dmesg reported

vmunix: tuner: chip found @ 0xc0
vmunix: tuner: type set to 19 (Temic PAL* auto (4006 FN5))
vmunix: tuner: type forced to 19 (Temic PAL* auto (4006 FN5)) [insmod]

I noticed that the a line had been removed from 2.6.1 and when it is added
everything works again.

diff --git a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c
index 7f905304dc176f03f6820d8bdd00df94320e852f..3814c8393f0cc8268dbd85b5dab584bc606e6ba5 100644 (file)
--- a/drivers/media/video/tuner.c
+++ b/drivers/media/video/tuner.c
@@ -1041,6 +1041,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 
         i2c_attach_client(client);
        if (type < TUNERS) {
+               t->type = type;
                printk("tuner: type forced to %d (%s) [insmod]\n",
                       t->type,tuners[t->type].name);
                set_type(client,type);