From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1A64C433E1 for ; Mon, 20 Jul 2020 19:04:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A174522B51 for ; Mon, 20 Jul 2020 19:04:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="WbDdGeNd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729342AbgGTTEl (ORCPT ); Mon, 20 Jul 2020 15:04:41 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:58816 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726012AbgGTTEl (ORCPT ); Mon, 20 Jul 2020 15:04:41 -0400 Received: from [192.168.0.20] (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 53CDB2A4; Mon, 20 Jul 2020 21:04:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1595271878; bh=KNtCu6HocOzqYYKCsCcla3s8hAt3olADl6cr5CFqkeg=; h=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From; b=WbDdGeNdkv05sl6Ov9CNPMuHACNQnhIp4Dc0zQjfZs5rfGa8+Quj9JrD/WxX8AiHu 353+vdl1fuLoKhPVVOEVYYISYvegNPtONOh+T/ZQyeJxp7YGFkX7TX3bmyI3fMX1NM mwsN7iYnwSsPCXJcaqIN3/dP9piBOsd4zev3wN88= Reply-To: kieran.bingham+renesas@ideasonboard.com Subject: Re: [PATCH][next] media: i2c: fix error check on max9286_read call To: Colin King , Jacopo Mondi , Laurent Pinchart , =?UTF-8?Q?Niklas_S=c3=b6derlund?= , Mauro Carvalho Chehab , linux-media@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org References: <20200720161335.339174-1-colin.king@canonical.com> From: Kieran Bingham Organization: Ideas on Board Message-ID: Date: Mon, 20 Jul 2020 20:04:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200720161335.339174-1-colin.king@canonical.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Colin, On 20/07/2020 17:13, Colin King wrote: > From: Colin Ian King > > Currently the error return from the call to max9286_read is masked > with 0xf0 so the following check for a negative error return is > never true. Fix this by checking for an error first, then masking > the return value for subsequent conflink_mask checking. Ooops! > Addresses-Coverity: ("Logically dead code") > fixes: 66d8c9d2422d ("media: i2c: Add MAX9286 driver") > Signed-off-by: Colin Ian King Thanks, Reviewed-by: Kieran Bingham > --- > drivers/media/i2c/max9286.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c > index 47f280518fdb..b364a3f60486 100644 > --- a/drivers/media/i2c/max9286.c > +++ b/drivers/media/i2c/max9286.c > @@ -405,10 +405,11 @@ static int max9286_check_config_link(struct max9286_priv *priv, > * to 5 milliseconds. > */ > for (i = 0; i < 10; i++) { > - ret = max9286_read(priv, 0x49) & 0xf0; > + ret = max9286_read(priv, 0x49); > if (ret < 0) > return -EIO; > > + ret &= 0xf0; > if (ret == conflink_mask) > break; > >