From 2b336c2c42bba373b049391279bdaf7e9645267c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 1 Sep 2006 18:39:05 -0300 Subject: [PATCH] --- yaml --- r: 37450 b: refs/heads/master c: 3e7d3e57350ab8b7b8ce930074a31c87f1cbc8cc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7115.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bf8c7fbbf252..662ce72e3302 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 616b8b639e6491cfa63f79238a5c6fbee383eb09 +refs/heads/master: 3e7d3e57350ab8b7b8ce930074a31c87f1cbc8cc diff --git a/trunk/drivers/media/video/saa7115.c b/trunk/drivers/media/video/saa7115.c index 2257e4e835a1..327a43d5116b 100644 --- a/trunk/drivers/media/video/saa7115.c +++ b/trunk/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);