[PATCH] v4l: 819: added autodetection code to tda8290 to avoid conflicts

- Added autodetection code to tda8290, to avoid conflicts with tda9887.

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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/tda8290.c b/drivers/media/video/tda8290.c
index fa9b4b898f68..abad3d5b04f6 100644
--- a/drivers/media/video/tda8290.c
+++ b/drivers/media/video/tda8290.c
@@ -534,8 +534,8 @@ int tda8290_init(struct i2c_client *c)
                 }
         if (tuner_addrs == 0) {
                 tuner_addrs = 0x61;
-                tuner_info ("could not clearly identify tuner address, defaulting to %x\n",
-                             tuner_addrs);
+                tuner_info ("Could not clearly identify tda8290/8275 tuner address.\n");
+                return -1;
         } else {
                 tuner_addrs = tuner_addrs & 0xff;
                 tuner_info ("setting tuner address to %x\n", tuner_addrs);