On 07/23/2015 02:21 PM, William Towle wrote: > 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. > --- > drivers/media/i2c/adv7604.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c > index bfb0b6a..0587d27 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", > Oops. Added to my TODO list, I'll probably pick this up on Tuesday for a pull request. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html