Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3642832pxb; Mon, 24 Jan 2022 14:14:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJytjUfFsRuZQzXNQ2myp8pcdDouoyCIXMIP4aM73s4t09Eszfh92cTQcmY1alRkS8oumbB8 X-Received: by 2002:a17:902:e552:b0:149:b7bf:9b42 with SMTP id n18-20020a170902e55200b00149b7bf9b42mr15453897plf.70.1643062454206; Mon, 24 Jan 2022 14:14:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643062454; cv=none; d=google.com; s=arc-20160816; b=KuuZkg7dk2VIpFzgN81oGFWdsZoELAHNEaM1w4F47GLBPe3OqErDigOdqATbHt+5vb E+5Xjy1bJ3Z4nbo1DDc8sPyEa3B2oksZOUav9Qwr4Mm2OqfT13x2sUt9NqqXsKzk0qfa 5VgtA+WSvt0VJdGLf1toxLuHUJLMZs0vqrxZwvn5qrCyaLl45Os3AlKfrDv/FxwRAmWJ fHxOdMX65qUASevey5vUl0WIk8BjZBfkEAVZ9WYok4SvLvzuAOnpEURwXyWu5gEikcUD K/y7nxdeSCfkEPTvlPGHSZNzOyotmJRC+T3gK6GvHotRwSC035m3ij7V7nQJsJTdMER0 WNbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2BHsJXeFLKEe8udwOzs/fH1ekRK5w4CjUbnbuNkG548=; b=lfb1R+QJYLBQfRkLfH1tzu4nGEL7A44bQ+rJViOtsE9geZBy69lgIH7aYtCaBjQF26 ttZiYmCduBUT5ZJxwqcMdsTCtvJ6vzycDn+NbA5Kct2FuK2NdQvaR4CRVYLXGMFIXZeF VKIhPACIMCMNpU3djVDfzSMn3aXs0+OwQKobrDvyk0XZZLHDDxgipWEkyIz4YlGt/m+9 m2zCCqTqzBylQSRwQCHvddxNVRaTU7p8uvsOAQggYbcNGfn1tN1QlQWdKOoLciSHQoNY /fCS1YmxaoukH51BgjoX5C1GZw+TzeptlZoTilQFZk057ysZ6pAvnrTL65zwfHZbAI1N ND0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=upn13DyI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v63si6398896pgd.878.2022.01.24.14.14.02; Mon, 24 Jan 2022 14:14:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=upn13DyI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1578252AbiAXWCL (ORCPT + 99 others); Mon, 24 Jan 2022 17:02:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1450665AbiAXVVI (ORCPT ); Mon, 24 Jan 2022 16:21:08 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2105DC0604D6; Mon, 24 Jan 2022 12:15:40 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DD389B8122A; Mon, 24 Jan 2022 20:15:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C078C340E5; Mon, 24 Jan 2022 20:15:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643055337; bh=5CefI8kLlzwKiG7jZGtST77aCSVR1qeHJlatpgTEvLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=upn13DyIc+oX5qInIv+d1umeSImgQhhAO4viNZUJR2TJWNQV23+13tdJ2HAt5A0Su fEI+9tgMy5aJ6ID+HfRTWoy0jF1PY/Z+e22eE3MElujKA/Zhz9EvPuOye8dUeSjev9 6AkHwW6UX8zoLbE3R6vA1GX4NaeZu0H5OwN17kWY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tsuchiya Yuto , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.15 111/846] media: atomisp: do not use err var when checking port validity for ISP2400 Date: Mon, 24 Jan 2022 19:33:48 +0100 Message-Id: <20220124184104.801612584@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tsuchiya Yuto [ Upstream commit 9f6b4fa2d2dfbff4b8a57eeb39b1128a6094ee20 ] Currently, the `port >= N_CSI_PORTS || err` checks for ISP2400 are always evaluated as true because the err variable is set to `-EINVAL` on declaration but the variable is never used until the evaluation. Looking at the diff of commit 3c0538fbad9f ("media: atomisp: get rid of most checks for ISP2401 version"), the `port >= N_CSI_PORTS` check is for ISP2400 and the err variable check is for ISP2401. Fix this issue by adding ISP version test there accordingly. Fixes: 3c0538fbad9f ("media: atomisp: get rid of most checks for ISP2401 version") Signed-off-by: Tsuchiya Yuto Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/atomisp/pci/sh_css_mipi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/sh_css_mipi.c index 483d40a467c74..65fc93c5d56bc 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_mipi.c +++ b/drivers/staging/media/atomisp/pci/sh_css_mipi.c @@ -430,7 +430,8 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, assert(port < N_CSI_PORTS); - if (port >= N_CSI_PORTS || err) { + if ((!IS_ISP2401 && port >= N_CSI_PORTS) || + (IS_ISP2401 && err)) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "allocate_mipi_frames(%p) exit: error: port is not correct (port=%d).\n", pipe, port); @@ -559,7 +560,8 @@ free_mipi_frames(struct ia_css_pipe *pipe) assert(port < N_CSI_PORTS); - if (port >= N_CSI_PORTS || err) { + if ((!IS_ISP2401 && port >= N_CSI_PORTS) || + (IS_ISP2401 && err)) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "free_mipi_frames(%p, %d) exit: error: pipe port is not correct.\n", pipe, port); @@ -670,7 +672,8 @@ send_mipi_frames(struct ia_css_pipe *pipe) assert(port < N_CSI_PORTS); - if (port >= N_CSI_PORTS || err) { + if ((!IS_ISP2401 && port >= N_CSI_PORTS) || + (IS_ISP2401 && err)) { IA_CSS_ERROR("send_mipi_frames(%p) exit: invalid port specified (port=%d).\n", pipe, port); return err; -- 2.34.1