Commit c7d543e9 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] v4l: tuner fix

From: Gerd Knorr <kraxel@bytesex.org>

This patch fixes a bug in the tuner descriptions and prepares for the removal
of the type= insmod option by printing a warning when it is used.
parent 83143486
...@@ -233,7 +233,7 @@ static struct tunertype tuners[] = { ...@@ -233,7 +233,7 @@ static struct tunertype tuners[] = {
{ "Philips 1236D ATSC/NTSC daul in",Philips,ATSC, { "Philips 1236D ATSC/NTSC daul in",Philips,ATSC,
16*157.25,16*454.00,0xa0,0x90,0x30,0x8e,732}, 16*157.25,16*454.00,0xa0,0x90,0x30,0x8e,732},
{ "Philips NTSC MK3 (FM1236MK3 or FM1236/F)", Philips, NTSC, { "Philips NTSC MK3 (FM1236MK3 or FM1236/F)", Philips, NTSC,
16*160.00,16*442.00,0x01,0x02,0x04,0x8,732}, 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
{ "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)", Philips, NTSC, { "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)", Philips, NTSC,
16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732}, 16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
...@@ -1050,8 +1050,12 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -1050,8 +1050,12 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
t->radio_if2 = 10700*1000; // 10.7MHz - FM radio t->radio_if2 = 10700*1000; // 10.7MHz - FM radio
i2c_attach_client(client); i2c_attach_client(client);
if (type < TUNERS) if (type < TUNERS) {
set_type(client, type, "insmod option"); set_type(client, type, "insmod option");
printk("tuner: The type=<n> insmod option will go away soon.\n");
printk("tuner: Please use the tuner=<n> option provided by\n");
printk("tuner: tv card core driver (bttv, saa7134, ...) instead.\n");
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment