aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-30 14:45:00 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-14 01:53:58 -0400
commitb538d28c2e326ed226096408dce4d9469d7ffa39 (patch)
tree10ec81016de1f846479d6450bc5c9f10aa4bffcc /drivers/media/video
parent09fee5f8211fc0a586187c4a0db7f5f42a4e333f (diff)
V4L/DVB (7804): tea5767: Fix error logic
As pointed by Andrew Morton, the error testing were wrong. After reviewing tea5767, it were returning a positive value for errors. So, the double errors were cancelling each other. This patch fix it properly. It also considers any positive value as ok, on tuner-core. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/tuner-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index b5dacde023ee..4ca686fad557 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -1165,7 +1165,7 @@ static int tuner_probe(struct i2c_client *client,
1165 /* If chip is not tda8290, don't register. 1165 /* If chip is not tda8290, don't register.
1166 since it can be tda9887*/ 1166 since it can be tda9887*/
1167 if (tuner_symbol_probe(tda829x_probe, t->i2c->adapter, 1167 if (tuner_symbol_probe(tda829x_probe, t->i2c->adapter,
1168 t->i2c->addr) == 0) { 1168 t->i2c->addr) >= 0) {
1169 tuner_dbg("tda829x detected\n"); 1169 tuner_dbg("tda829x detected\n");
1170 } else { 1170 } else {
1171 /* Default is being tda9887 */ 1171 /* Default is being tda9887 */
@@ -1179,7 +1179,7 @@ static int tuner_probe(struct i2c_client *client,
1179 case 0x60: 1179 case 0x60:
1180 if (tuner_symbol_probe(tea5767_autodetection, 1180 if (tuner_symbol_probe(tea5767_autodetection,
1181 t->i2c->adapter, t->i2c->addr) 1181 t->i2c->adapter, t->i2c->addr)
1182 != EINVAL) { 1182 >= 0) {
1183 t->type = TUNER_TEA5767; 1183 t->type = TUNER_TEA5767;
1184 t->mode_mask = T_RADIO; 1184 t->mode_mask = T_RADIO;
1185 t->mode = T_STANDBY; 1185 t->mode = T_STANDBY;