aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7115.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-09-01 17:39:05 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 11:30:35 -0400
commit3e7d3e57350ab8b7b8ce930074a31c87f1cbc8cc (patch)
treec32489cfcbc88c5b08e36a6e94c39b2ec304f274 /drivers/media/video/saa7115.c
parent616b8b639e6491cfa63f79238a5c6fbee383eb09 (diff)
V4L/DVB (4586): Code were preventing saa7111 and saa7118 to work
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7115.c')
-rw-r--r--drivers/media/video/saa7115.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 2257e4e835a1..327a43d5116b 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1476,11 +1476,7 @@ static int saa711x_attach(struct i2c_adapter *adapter, int address, int kind)
1476 1476
1477 saa711x_write(client, 0, 5); 1477 saa711x_write(client, 0, 5);
1478 chip_id = saa711x_read(client, 0) & 0x0f; 1478 chip_id = saa711x_read(client, 0) & 0x0f;
1479 if (chip_id < 3 && chip_id > 5) { 1479
1480 v4l_dbg(1, debug, client, "saa7115 not found\n");
1481 kfree(client);
1482 return 0;
1483 }
1484 snprintf(client->name, sizeof(client->name) - 1, "saa711%d",chip_id); 1480 snprintf(client->name, sizeof(client->name) - 1, "saa711%d",chip_id);
1485 v4l_info(client, "saa711%d found (%s) @ 0x%x (%s)\n", chip_id, name, address << 1, adapter->name); 1481 v4l_info(client, "saa711%d found (%s) @ 0x%x (%s)\n", chip_id, name, address << 1, adapter->name);
1486 1482