aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorWilliam Towle <william.towle@codethink.co.uk>2015-07-23 09:21:33 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-08-11 09:54:00 -0300
commitc1362384a85e429cd4e6f5fd65f130770224bcef (patch)
treed596ce6f80b2e9d66a8c6eee4c813700dd9224cc /drivers/media/i2c
parent16225ea7fa6843482c562f033b7ec270651636e9 (diff)
[media] media: adv7604: fix probe of ADV7611/7612
Prior to commit f862f57d ("[media] media: i2c: ADV7604: Migrate to regmap"), the local variable 'val' contained the combined register reads used in the chipset version ID test. Restore this expectation so that the comparison works as it used to. Signed-off-by: William Towle <william.towle@codethink.co.uk> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/adv7604.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index bfb0b6a72bbc..0587d2755809 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -3108,7 +3108,7 @@ static int adv76xx_probe(struct i2c_client *client,
v4l2_err(sd, "Error %d reading IO Regmap\n", err);
return -ENODEV;
}
- val2 |= val;
+ val |= val2;
if ((state->info->type == ADV7611 && val != 0x2051) ||
(state->info->type == ADV7612 && val != 0x2041)) {
v4l2_err(sd, "not an adv761x on address 0x%x\n",

Privacy Policy