diff options
author | Ricardo Cerqueira <v4l@cerqueira.org> | 2005-11-09 08:38:33 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 18:56:28 +0300 |
commit | 291d1d7356a2cf1da4934a06c4a4e3bca440fbc6 (patch) | |
tree | f55bd3019af4566968657b9b2cd645688ea0fe79 /drivers/media/video/tuner-core.c | |
parent | d0fcdd7815e26f2e4a4ad239e2b464402a185f66 (diff) | |
download | linux-291d1d7356a2cf1da4934a06c4a4e3bca440fbc6.tar.xz |
[PATCH] v4l: 893: rollback recent i2c change to solve tuner detection breakage
- Rollback recent i2c change to solve tuner detection breakage
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
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>
Diffstat (limited to 'drivers/media/video/tuner-core.c')
-rw-r--r-- | drivers/media/video/tuner-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 3fde4f90425a..73c4041c35d7 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c @@ -222,9 +222,9 @@ static void set_addr(struct i2c_client *c, struct tuner_setup *tun_setup) { struct tuner *t = i2c_get_clientdata(c); - if ((tun_setup->addr == ADDR_UNSET && + if ( t->type == UNSET && ((tun_setup->addr == ADDR_UNSET && (t->mode_mask & tun_setup->mode_mask)) || - tun_setup->addr == c->addr) { + tun_setup->addr == c->addr)) { set_type(c, tun_setup->type, tun_setup->mode_mask); } } |