summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2011-01-30 10:03:30 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-31 14:19:50 -0200
commitbed3c1de66d04f9e5efcdfc5b8035f3354c4ffcc (patch)
tree05f7397e5a73e9ddcfe196ec2a0da4841e49a296 /drivers/media
parent56b0ec30c4bc096848efc617f29e525cde2f7084 (diff)
downloadlinux-bed3c1de66d04f9e5efcdfc5b8035f3354c4ffcc.tar.gz
linux-bed3c1de66d04f9e5efcdfc5b8035f3354c4ffcc.tar.bz2
linux-bed3c1de66d04f9e5efcdfc5b8035f3354c4ffcc.zip
[media] fix saa7111 non-detection
One saa7111 device is reporting a different ID: saa7115 0-0024: chip found @ 0x48 (ID 0f7111d0e111111) does not match a known saa711x chip. As this is for sure a saa7111, change the detection code to also cover this device. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/saa7115.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index f35459d1f42f..0db90922ee93 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1565,7 +1565,7 @@ static int saa711x_probe(struct i2c_client *client,
chip_id = name[5];
/* Check whether this chip is part of the saa711x series */
- if (memcmp(name, "1f711", 5)) {
+ if (memcmp(name + 1, "f711", 4)) {
v4l_dbg(1, debug, client, "chip found @ 0x%x (ID %s) does not match a known saa711x chip.\n",
client->addr << 1, name);
return -ENODEV;