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: GEkh8OYbB/BBcyHZIjEremwbHyKkOk0XK89FG/LpJK08M++NeG+rPk587OGbEkGt0BwEmvtKG+
 DDVE90rrNFfSAXmWWQJkFvycW412+2Wur+p41hOJcHpPEtWXh7fMWq9FcS8s6fgwvAVZCDpv4n
 uYhXwse7Ez2D7cEOtvYNNwLJ6vLwMKgPM2grecrv2Zs/fp/T5NuGs0Iy3YIN/JDSitvM7Pb0FF
 /P5QDipfD+QmCMPm8hPnK3PSfjf9cLW3YfbFSqWCDQYVR/24XHT463/DtlS1opn8+F3Zug+5xI
 pkE=
IronPort-PHdr: A9a23:j0cSFx3qcqGNzqm2smDOUwQyDhhOgF0UFjAc5pdvsb9SaKPrp82kY
 BWOo64x0BSVAs3y0LFts6LuqafuWGgNs96qkUspV9hybSIDktgchAc6AcSIWgXRJf/uaDEmT
 owZDAc2t360PlJIF8ngelbcvmO97SIIGhX4KAF5Ovn5FpTdgsiq0+2+4ZPebgpHiTaybr5/L
 gi9oBnMuMURnYZsMLs6xAHTontPdeRWxGdoKkyWkh3h+Mq+/4Nt/jpJtf45+MFOTav1f6IjT
 bxFFzsmKHw65NfqtRbYUwSC4GYXX3gMnRpJBwjF6wz6Xov0vyDnuOdxxDWWMMvrRr0vRz+s8
 7lkRwPpiCcfNj427mfXitBrjKlGpB6tvgFzz5LIbI2QMvd+e6LdfcgBRWpAWMZRWDFKDJ2lY
 YASAeoBPPhXr43gqFATqRezCxWgCObpxzBPmnL707E23/k4HQ3awQArAtYCvGnUodnwMqoZT
 OK7w7TSzTjbb/1Yxyrz5obLfB4muvyAQa58fNDNxUQ1Cw/JklOdopHlMTOP0eQNtnCW4OhhV
 eOui24ntgZxqSWoy8Ysi4jJhpgaylHY+Sllzos4PsC4R1JhYdK+DpRfqjyaOpJwT8g/TG5mp
 Dw0xacauZ6nYicK0pInygbQZvCZcYWG4g7vWeKRLztmhH9oe7yxigis/Uagy+DxVNS53VdIo
 ydBk9TBt24A2gDQ58SbVvdw/Fqt1DmR2w7T7OxPPEM6lbLDJpI/3rI9koAfvEfDEyPshkn6k
 bOael859uWs7+nreqjqq56YOoNulA3zPKQjltahDek6KAQCQXaX9Oq62bb+50P2Wq9Kgeczk
 qTBtZDaItkUqbChDg9O14Yj9w6/DzC70NQEhXUHLExKeBaAj4XxPlHBOvH4DfOmj1S0njdn2
 unKPrP8DpjJKnXPirjhfbF6605TzAo808pT6I5TCrEEOP7zW0nxu8LEDhIhLQC43+LqBM9+2
 44eQ26DHLKVPL/IvVOV4u8iJ/GAZIoPtzb8L/gl6eTujXg8mVIFfaio3JsXZ2q5Hvh6P0mUb
 2HhgsodHmcQpAYxUvHliECaXT5Je3myR7485i08CI++CYfDR4atgKGO3SuiHZ1ZeHpGClaSH
 nfsbIiERfgMZzyIIsN7kTwLS6KhS4k/2hGqrgP6zKBnLuWHsgMCspe25dln5/DU3UUj5zx9D
 pzFiEmQRHsyk28VEWxllJtjqFBwnw/QmZNzhOZVQJkOupt0
IronPort-HdrOrdr: A9a23:+VekoKPjCD+S1sBcTsCjsMiBIKoaSvp037Dk7TEVdfU7SL3+qy
 nDpoV56faLskd2ZJhIo7npU8m9qBvnlKKdirNhWYtKMjOW2ldA77sO0WIh+Vfd8uHFmdK1rZ
 0QCpSWweedY2RHsQ==
From:   Yizhuo <yzhai003@ucr.edu>
Cc:     Yizhuo <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 v2] media: atomisp: fix the uninitialized use and rename "retvalue"
Date:   Thu, 24 Jun 2021 03:17:17 +0000
Message-Id: <20210624031719.11157-1-yzhai003@ucr.edu>
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.

Signed-off-by: Yizhuo <yzhai003@ucr.edu>
---
 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 12 ++++++++----
 1 file changed, 8 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..b02a8cd3dde7 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c
@@ -1533,16 +1533,20 @@ 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,
+			       (u32)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.17.1