[PATCH] v4l: 848: fixed tda8290 autodetection
- Fixed tda8290 autodetection Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t.online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
5d5c9904e5
commit
07345f5d6a
|
@ -362,6 +362,18 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
|
||||||
/* TEA5767 autodetection code - only for addr = 0xc0 */
|
/* TEA5767 autodetection code - only for addr = 0xc0 */
|
||||||
if (!no_autodetect) {
|
if (!no_autodetect) {
|
||||||
switch (addr) {
|
switch (addr) {
|
||||||
|
case 0x42:
|
||||||
|
case 0x43:
|
||||||
|
case 0x4a:
|
||||||
|
case 0x4b:
|
||||||
|
/* If chip is not tda8290, don't register.
|
||||||
|
since it can be tda9887*/
|
||||||
|
if (tda8290_probe(&t->i2c) != 0) {
|
||||||
|
tuner_dbg("chip at addr %x is not a tda8290\n", addr);
|
||||||
|
kfree(t);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 0x60:
|
case 0x60:
|
||||||
if (tea5767_autodetection(&t->i2c) != EINVAL) {
|
if (tea5767_autodetection(&t->i2c) != EINVAL) {
|
||||||
t->type = TUNER_TEA5767;
|
t->type = TUNER_TEA5767;
|
||||||
|
@ -372,19 +384,8 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
|
||||||
|
|
||||||
goto register_client;
|
goto register_client;
|
||||||
}
|
}
|
||||||
case 0x42:
|
break;
|
||||||
case 0x43:
|
|
||||||
case 0x4a:
|
|
||||||
case 0x4b:
|
|
||||||
/* If chip is not tda8290, don't register.
|
|
||||||
since it can be tda9887*/
|
|
||||||
if (tda8290_probe(&t->i2c) != 0) {
|
|
||||||
kfree(t);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initializes only the first adapter found */
|
/* Initializes only the first adapter found */
|
||||||
|
|
Loading…
Reference in New Issue