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;
IronPort-SDR: jmnrK9UjCkOrQplTKJIthzEEd4vq217xHIdaNQJD1xWJDVIlPuQExC29KGFEZdv7HodWoILm4z
 TiMYVbxPg7JRvvdlsF8WeBVtWRpzuOhymBnRxjg4xpjbpsB/7zcRa8GLTfxm2fWvURoLmIDZpk
 gaZ7L7R7tStXdg/sk/iYmK8knVllXs5WVMT15TwKvLJqsZL+nGYwhwDg1ELTFzXQ8zTiKjVpd3
 eBBgxaqWtkOzGxdMCF16mvqd4EJB6AfjXh4s7E+Z6qxj3Wbr4U1A9UHuBccdfCoNtPZYDFxAId
 DZv387wb76P391uaga7rHKPT
IronPort-PHdr: A9a23:YOeQZROnvVQMaoBTlggl6nbNDRdPi9zP1u491JMrhvp0f7i5+Ny6Z
 QqDv60r3AWCDdmTwskHotKei7rnV20E7MTJm1E5W7sIaSU4j94LlRcrGs+PBB6zBvfraysnA
 JYKDwc9rDm0PkdPBcnxeUDZrGGs4j4OABX/Mhd+KvjoFoLIgMm7yfy+94fQbglWizawYrx/J
 wiqoAvMscUbnZFsIbsrxBvTpXtIdeVWxWd2Kl+Wgh3x+MS+8oN9/ipJo/4u+NJOXqv8f6QjU
 LxXFy8mPHwv5M3qrhbMUw2C7WYBX2oMkxpIBw/F7AzmXpr0ryD3uPZx1DWcMMbrVr0/Ryis4
 Ll3Rx/pkCcHNiA28GfLisxrkalXpAutqwFjz4LIZY2YMv9+fqLGfdMBRGpBWMlRXDFfDI2lc
 oAPAesBMvhcr4bgulACqRWzCRWpCO7pzTBFmnH70bEn3+g4DQ3KwRErE9YTvHnUqdn4MroZX
 +Kow6nS1TjNb+1Y1yrz5obLdR4uo/+MUr1/f8fK1UUiFBnIgkmKpID5Iz+Y0PkGvWiB7+pnU
 OKik2woqwBwoziv28csjZTCiYEVyl/e9CVy3YE4JN25SU57e9GkEYdcuz2UOoZtX8MtX3tot
 DwkxbIbpJ62ZS4Hw4koyBDDcfKIaZSI4g79W+aLJzd1nG5odaywiRiy/kat1+zxW8m03ltUs
 ydJjMXBu20T2xHN6cWKSvVw80iu1zuPyQzd5e5JLEEwmKfGNZMvzLo9m5UVvE/eHSH2gF37g
 LGKekgg4OSl6OTqbq/4qpOBNoJ4kAPzPrg2lsCiAOk1NhICU3aV9Om8zrHv40/0TK9UgvEon
 KTUto3RK94Bqa6jGQBV154u6xO4Dzi7ztsVhWIHLFdZeBKfiIjpJk3OLOj4Dfihh1Ssly9mx
 /XcMb3gBpXBN2DDkLX8cbpk5U5RyhY/wcpQ55JTDbEBL/bzVVHruNPECR85NhS4w+fhCNpjy
 oMTQXyDDrOdPa/IslKF5vgjL/eRaIIUojrwKeQp6+brjXAjmF8deaep3YEQaHC9BvlnI0SYY
 Xr2jdcADWsGogQzQff3iFKeSz5ffWi9UL8h5j0jEoKpEZ/DRpyxgLyGxCq7GpxWZmZbClGDC
 HvodJuLW+0KaC2MJs9siSIEVbe/RI87zx2utxH1y6BhLuXK/i0Ur5Xj1MJ6576buws18GlFD
 tadzmbFfWF9nytcVi021aEn+RdV11yZl6V0nqoLRpRo+/pVX1JiZtbnxOtgBoW3B1+pQw==
IronPort-HdrOrdr: A9a23:pvLSYKoiPKvI1+afDkEXzFYaV5oCeYIsimQD101hICG9vPbo8v
 xG+85rqCMc5wxhP03I9erwW5VoBEmsjaKdgrNhR4tKIjOW3ldARbsKheCD/9SjIVyEygc078
 ZdmsNFebnN5DZB/KTHCcqDfurIAuPszEllv4jjJg9WPHhXgmhbg2lENjo=
From:   Yizhuo Zhai <yzhai003@ucr.edu>
Cc:     Yizhuo Zhai <yzhai003@ucr.edu>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Sakari Ailus <sakari.ailus@linux.intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Juan Antonio Aldea-Armenteros <juant.aldea@gmail.com>,
        linux-media@vger.kernel.org, linux-staging@lists.linux.dev,
        linux-kernel@vger.kernel.org
Subject: [PATCH v4] media: atomisp: fix the uninitialized use and rename "retvalue"
Date:   Thu, 12 Aug 2021 00:34:46 -0700
Message-Id: <20210812073447.127193-1-yzhai003@ucr.edu>
In-Reply-To: <20210723003607.64179-1-yzhai003@ucr.edu>
References: <20210723003607.64179-1-yzhai003@ucr.edu>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk

Inside function mt9m114_detect(), variable "retvalue" could
be uninitialized if mt9m114_read_reg() returns error, however, it
is used in the later if statement, which is potentially unsafe.

The local variable "retvalue" is renamed to "model" to avoid
confusion.

Fixes: ad85094b293e ("Revert "media: staging: atomisp: Remove driver"")
Signed-off-by: Yizhuo Zhai <yzhai003@ucr.edu>
---
 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
index f5de81132177..77293579a134 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1533,16 +1533,19 @@ static struct v4l2_ctrl_config mt9m114_controls[] = {
 static int mt9m114_detect(struct mt9m114_device *dev, struct i2c_client *client)
 {
 	struct i2c_adapter *adapter = client->adapter;
-	u32 retvalue;
+	u32 model;
+	int ret;
 
 	if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
 		dev_err(&client->dev, "%s: i2c error", __func__);
 		return -ENODEV;
 	}
-	mt9m114_read_reg(client, MISENSOR_16BIT, (u32)MT9M114_PID, &retvalue);
-	dev->real_model_id = retvalue;
+	ret = mt9m114_read_reg(client, MISENSOR_16BIT, MT9M114_PID, &model);
+	if (ret)
+		return ret;
+	dev->real_model_id = model;
 
-	if (retvalue != MT9M114_MOD_ID) {
+	if (model != MT9M114_MOD_ID) {
 		dev_err(&client->dev, "%s: failed: client->addr = %x\n",
 			__func__, client->addr);
 		return -ENODEV;
-- 
2.25.1