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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97F7BC433EF for ; Sun, 17 Oct 2021 16:21:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B03361151 for ; Sun, 17 Oct 2021 16:21:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344099AbhJQQXX (ORCPT ); Sun, 17 Oct 2021 12:23:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344103AbhJQQXQ (ORCPT ); Sun, 17 Oct 2021 12:23:16 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF26AC06176C; Sun, 17 Oct 2021 09:21:06 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id 133so13550028pgb.1; Sun, 17 Oct 2021 09:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kPQMaAl18vlXvtzY3u2mFwVBriklZfpAQgwXY9rKh7o=; b=nMgftG/DJnSH7FCQYuApWdUYV+mxq1ZnJSRJjmHhsiR1b/igSdXAML30k1n/UfRUx7 P/Cxy1p3Kl5tx2kDt6hrTthg0WnjWP6YykTL9HvhPkp2adma+BPr9W1zS5Y1sfXaGKLy jBdOdtDMKDC8x7fWcqQ+t9prMgAyQwOtpnEblfAPyVENuPdZObTboG2xnRG6BX5Ldb6J wvxbEmthg3ey5k+sX4MJQ+y/DTpd9IsYZZihsvf8wO97Y13FcsgnVc8i9iaAu8HzB/8g 5U+C7Gf4UGvQPSOcyeYLpx40dGvyBZdPXGyq2/1ldP+EUlOBWUwj7a6nMTfdxhpeSnl3 iQyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kPQMaAl18vlXvtzY3u2mFwVBriklZfpAQgwXY9rKh7o=; b=gx+W+oL0Ki3uTWzYAEVa4rE5k1ToSq3R+NKPz1c3GeiFPA0ZZSW1u1SvQaf1wjodDH gluEPo5rt9nrs8LDQboXRmwffDgMpNApsBF6rIAbxVphUWNSLEVomADrPxHXEsEu+qbO cgxOGpqcJ0GVSXwRHnMGgEL6Xk0+i78YkZl1mNwGgYPI2Ew75MFqAiD0C6eMeR7MwRSe WsSTgOr6obKGLjCzE3e1wGteA7A77zzgPKSc6nj9/TpKDDgUk/lDXyOXH1xXQhxz4N/V mVeYfyaPjeyE9M32OzWLBXq8x21VtHtGoLYzuXq/Sa+amORG1X22JUoupTeaKLUtzhhF h1TQ== X-Gm-Message-State: AOAM530vFTGWGrsRfQC7noNMlX0qMjQrOxvoPhWkEqBWLYW5NslInoOn Wuqe1s1zdQGYaDjxZriTn/A= X-Google-Smtp-Source: ABdhPJwylO8lupxyYn8xSrX8xDfdHl+dQQeZXlCuVVmcKZ/ex48H0ClPY3krGCeMRZNLTxdK7A5Sng== X-Received: by 2002:a62:1c4e:0:b0:44d:76b:de98 with SMTP id c75-20020a621c4e000000b0044d076bde98mr24413785pfc.16.1634487666153; Sun, 17 Oct 2021 09:21:06 -0700 (PDT) Received: from sbwpb-arch.flets-east.jp ([2400:4052:6980:3800:dba7:2b1f:3f26:a5ec]) by smtp.gmail.com with ESMTPSA id mu11sm5155444pjb.20.2021.10.17.09.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 09:21:05 -0700 (PDT) From: Tsuchiya Yuto Cc: Hans de Goede , Patrik Gfeller , Tsuchiya Yuto , Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , Hans Verkuil , Aline Santana Cordeiro , Yang Yingliang , Alan , Dinghao Liu , Deepak R Varma , Alex Dewar , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/17] media: atomisp: pci: fix inverted error check for ia_css_mipi_is_source_port_valid() Date: Mon, 18 Oct 2021 01:19:45 +0900 Message-Id: <20211017161958.44351-6-kitakar@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211017161958.44351-1-kitakar@gmail.com> References: <20211017161958.44351-1-kitakar@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The function ia_css_mipi_is_source_port_valid() returns true if the port is valid. So, we can't use the existing err variable as is. To fix this issue while reusing that variable, invert the return value when assigning it to the variable. Fixes: 3c0538fbad9f ("media: atomisp: get rid of most checks for ISP2401 version") Signed-off-by: Tsuchiya Yuto --- .../staging/media/atomisp/pci/sh_css_mipi.c | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/sh_css_mipi.c index 65fc93c5d56b..c1f2f6151c5f 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_mipi.c +++ b/drivers/staging/media/atomisp/pci/sh_css_mipi.c @@ -423,10 +423,12 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, return 0; /* AM TODO: Check */ } - if (!IS_ISP2401) + if (!IS_ISP2401) { port = (unsigned int)pipe->stream->config.source.port.port; - else - err = ia_css_mipi_is_source_port_valid(pipe, &port); + } else { + /* Returns true if port is valid. So, invert it */ + err = !ia_css_mipi_is_source_port_valid(pipe, &port); + } assert(port < N_CSI_PORTS); @@ -553,10 +555,12 @@ free_mipi_frames(struct ia_css_pipe *pipe) return err; } - if (!IS_ISP2401) + if (!IS_ISP2401) { port = (unsigned int)pipe->stream->config.source.port.port; - else - err = ia_css_mipi_is_source_port_valid(pipe, &port); + } else { + /* Returns true if port is valid. So, invert it */ + err = !ia_css_mipi_is_source_port_valid(pipe, &port); + } assert(port < N_CSI_PORTS); @@ -665,10 +669,12 @@ send_mipi_frames(struct ia_css_pipe *pipe) /* TODO: AM: maybe this should be returning an error. */ } - if (!IS_ISP2401) + if (!IS_ISP2401) { port = (unsigned int)pipe->stream->config.source.port.port; - else - err = ia_css_mipi_is_source_port_valid(pipe, &port); + } else { + /* Returns true if port is valid. So, invert it */ + err = !ia_css_mipi_is_source_port_valid(pipe, &port); + } assert(port < N_CSI_PORTS); -- 2.33.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B53C12C81 for ; Sun, 17 Oct 2021 16:21:06 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id q19so12839290pfl.4 for ; Sun, 17 Oct 2021 09:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kPQMaAl18vlXvtzY3u2mFwVBriklZfpAQgwXY9rKh7o=; b=nMgftG/DJnSH7FCQYuApWdUYV+mxq1ZnJSRJjmHhsiR1b/igSdXAML30k1n/UfRUx7 P/Cxy1p3Kl5tx2kDt6hrTthg0WnjWP6YykTL9HvhPkp2adma+BPr9W1zS5Y1sfXaGKLy jBdOdtDMKDC8x7fWcqQ+t9prMgAyQwOtpnEblfAPyVENuPdZObTboG2xnRG6BX5Ldb6J wvxbEmthg3ey5k+sX4MJQ+y/DTpd9IsYZZihsvf8wO97Y13FcsgnVc8i9iaAu8HzB/8g 5U+C7Gf4UGvQPSOcyeYLpx40dGvyBZdPXGyq2/1ldP+EUlOBWUwj7a6nMTfdxhpeSnl3 iQyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kPQMaAl18vlXvtzY3u2mFwVBriklZfpAQgwXY9rKh7o=; b=1DeyF3yPLE16fB1s9nuQmFvZY5DKNFqT9RZP4iOGm8nd6kxOpCYZv83Rt1JqlG1UQ1 2SXb9EWGeQLwQiw1lMGtnOoWpUQMmnjzOZpvIfRW0zErwa0/B1Zz8K7GwHVWHs4vMrVG R3tOoMEHEouNGdSzZfh1d4y/i2sQcJ6Zve2GkYDh1reuQJ2O0Ep6jlAEr3TneamktJjG BZR3ruLqg3POD34jIrVwb14MTyj4S6fj8RLPr57mCePnxx2YSbETzZ+U4uGp5WhP6j02 DVraiT+m6xVexXkpeQgv87KeZ1fvlNqYSVm1kRj77VfqZL1n4BtKkzmTMZ1H0YxfLtKZ DViA== X-Gm-Message-State: AOAM532f+35Uw9kkjfVe6jk8YUP3OJmrzOm83jo2oLPECVALNuRkCcj9 W1yGDs3W0H6RwW54SArzDWQ= X-Google-Smtp-Source: ABdhPJwylO8lupxyYn8xSrX8xDfdHl+dQQeZXlCuVVmcKZ/ex48H0ClPY3krGCeMRZNLTxdK7A5Sng== X-Received: by 2002:a62:1c4e:0:b0:44d:76b:de98 with SMTP id c75-20020a621c4e000000b0044d076bde98mr24413785pfc.16.1634487666153; Sun, 17 Oct 2021 09:21:06 -0700 (PDT) Received: from sbwpb-arch.flets-east.jp ([2400:4052:6980:3800:dba7:2b1f:3f26:a5ec]) by smtp.gmail.com with ESMTPSA id mu11sm5155444pjb.20.2021.10.17.09.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Oct 2021 09:21:05 -0700 (PDT) From: Tsuchiya Yuto To: Cc: Hans de Goede , Patrik Gfeller , Tsuchiya Yuto , Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , Hans Verkuil , Aline Santana Cordeiro , Yang Yingliang , Alan , Dinghao Liu , Deepak R Varma , Alex Dewar , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/17] media: atomisp: pci: fix inverted error check for ia_css_mipi_is_source_port_valid() Date: Mon, 18 Oct 2021 01:19:45 +0900 Message-Id: <20211017161958.44351-6-kitakar@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211017161958.44351-1-kitakar@gmail.com> References: <20211017161958.44351-1-kitakar@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The function ia_css_mipi_is_source_port_valid() returns true if the port is valid. So, we can't use the existing err variable as is. To fix this issue while reusing that variable, invert the return value when assigning it to the variable. Fixes: 3c0538fbad9f ("media: atomisp: get rid of most checks for ISP2401 version") Signed-off-by: Tsuchiya Yuto --- .../staging/media/atomisp/pci/sh_css_mipi.c | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/sh_css_mipi.c index 65fc93c5d56b..c1f2f6151c5f 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_mipi.c +++ b/drivers/staging/media/atomisp/pci/sh_css_mipi.c @@ -423,10 +423,12 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, return 0; /* AM TODO: Check */ } - if (!IS_ISP2401) + if (!IS_ISP2401) { port = (unsigned int)pipe->stream->config.source.port.port; - else - err = ia_css_mipi_is_source_port_valid(pipe, &port); + } else { + /* Returns true if port is valid. So, invert it */ + err = !ia_css_mipi_is_source_port_valid(pipe, &port); + } assert(port < N_CSI_PORTS); @@ -553,10 +555,12 @@ free_mipi_frames(struct ia_css_pipe *pipe) return err; } - if (!IS_ISP2401) + if (!IS_ISP2401) { port = (unsigned int)pipe->stream->config.source.port.port; - else - err = ia_css_mipi_is_source_port_valid(pipe, &port); + } else { + /* Returns true if port is valid. So, invert it */ + err = !ia_css_mipi_is_source_port_valid(pipe, &port); + } assert(port < N_CSI_PORTS); @@ -665,10 +669,12 @@ send_mipi_frames(struct ia_css_pipe *pipe) /* TODO: AM: maybe this should be returning an error. */ } - if (!IS_ISP2401) + if (!IS_ISP2401) { port = (unsigned int)pipe->stream->config.source.port.port; - else - err = ia_css_mipi_is_source_port_valid(pipe, &port); + } else { + /* Returns true if port is valid. So, invert it */ + err = !ia_css_mipi_is_source_port_valid(pipe, &port); + } assert(port < N_CSI_PORTS); -- 2.33.1