From patchwork Mon Jul 27 12:29:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Towle X-Patchwork-Id: 6873171 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 22C129F358 for ; Mon, 27 Jul 2015 12:30:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18A17205E8 for ; Mon, 27 Jul 2015 12:30:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0536B20527 for ; Mon, 27 Jul 2015 12:30:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753781AbbG0M34 (ORCPT ); Mon, 27 Jul 2015 08:29:56 -0400 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:36686 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753778AbbG0M3z (ORCPT ); Mon, 27 Jul 2015 08:29:55 -0400 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id B9FE6460CC1; Mon, 27 Jul 2015 13:29:53 +0100 (BST) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HjLrD33Nbd9t; Mon, 27 Jul 2015 13:29:51 +0100 (BST) Received: from xk120.dyn.ducie.codethink.co.uk (xk120.dyn.ducie.codethink.co.uk [10.24.1.159]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPSA id 3B5AB461AD5; Mon, 27 Jul 2015 13:29:51 +0100 (BST) Date: Mon, 27 Jul 2015 13:29:49 +0100 (BST) From: William Towle X-X-Sender: william@xk120.dyn.ducie.codethink.co.uk To: Hans Verkuil cc: William Towle , linux-media@vger.kernel.org, linux-kernel@lists.codethink.co.uk, Guennadi Liakhovetski , Sergei Shtylyov Subject: Re: [PATCH 03/13] media: adv7604: fix probe of ADV7611/7612 In-Reply-To: <55B24978.1080109@xs4all.nl> Message-ID: References: <1437654103-26409-1-git-send-email-william.towle@codethink.co.uk> <1437654103-26409-4-git-send-email-william.towle@codethink.co.uk> <55B24978.1080109@xs4all.nl> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, 24 Jul 2015, Hans Verkuil wrote: >> - val2 |= val; >> + val |= val2; > Oops. Added to my TODO list, I'll probably pick this up on Tuesday for a pull > request. And an oops from me: a keen-eyed local correspondent spotted that I'd omitted the S-o-b :( Wills. ... Subject: [PATCH] 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 --- 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",