diff options
| author | Mauro Carvalho Chehab | 2006-09-01 23:39:05 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2006-09-26 17:30:35 +0200 |
| commit | 3e7d3e57350ab8b7b8ce930074a31c87f1cbc8cc (patch) | |
| tree | c32489cfcbc88c5b08e36a6e94c39b2ec304f274 /drivers/media | |
| parent | V4L/DVB (4585): VIDIOC_G_SLICED_VBI_CAP now accepts a v4l2_buf_type, make it ... (diff) | |
| download | kernel-qcow2-linux-3e7d3e57350ab8b7b8ce930074a31c87f1cbc8cc.tar.gz kernel-qcow2-linux-3e7d3e57350ab8b7b8ce930074a31c87f1cbc8cc.tar.xz kernel-qcow2-linux-3e7d3e57350ab8b7b8ce930074a31c87f1cbc8cc.zip | |
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')
| -rw-r--r-- | drivers/media/video/saa7115.c | 6 |
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) saa711x_write(client, 0, 5); chip_id = saa711x_read(client, 0) & 0x0f; - if (chip_id < 3 && chip_id > 5) { - v4l_dbg(1, debug, client, "saa7115 not found\n"); - kfree(client); - return 0; - } + snprintf(client->name, sizeof(client->name) - 1, "saa711%d",chip_id); v4l_info(client, "saa711%d found (%s) @ 0x%x (%s)\n", chip_id, name, address << 1, adapter->name); |