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: S9P4pnI3yWb2OxF4GM/rUrhZx+az0UQPSDh24Gz+XfLzavOdDxlWxygBDZE2T0SsCqMrE/+Bmo
 6qOsZPpZi7yPXYaAU/k91mStR7tpi/2PANL+Dsydyo9UdyulDi3rBWfp0U0z5wMKZ1jvcZbdbh
 Hov2rUNR6jdCh0R/xoU5knX1nh9LVKlqMgnFsMmNG8xZXtDq+Uf0pInqXOeBXEmEhK4QsIPLAx
 nWOXAyVAz7fRW/x5N2Cx9MBeECrI5WLVqsV848H6NbrZJDtRKd8JoRGpLc6ayrySaPEn13s6Ar
 6kE=
IronPort-PHdr: A9a23:SYxabBCKhTP5y0NwJqW0UyQUlkMY04WdBeb1wqQuh78GSKm/5ZOqZ
 BWZuaw8ygSVA86FtrptsKn/i+jYQ2sO4JKM4jgpUadncFs7s/gQhBEqG8WfCEf2f7bAZi0+G
 9leBhc+pynoeUdaF9zjaFLMv3a88SAdGgnlNQpyO+/5BpPeg9642uyv/5DfeQtFiTW8bL99L
 Ri7rRjau9ULj4dlNqs/0AbCrGFSe+RRy2NoJFaTkAj568yt4pNt8Dletuw4+cJYXqr0Y6o3T
 bpDDDQ7KG81/9HktQPCTQSU+HQRVHgdnwdSDAjE6BH6WYrxsjf/u+Fg1iSWIdH6QLYpUjm58
 axlVAHnhzsGNz4h8WHYlMpwjL5AoBm8oxBz2pPYbJ2JOPZ7eK7deNIaRXFaXsZQUSxBDZ63Y
 ZUWAeEcM+ZYrpfyp18TohCjAQWhCv/jxjpOi3DxwaA33fgtHRzf0AA8At4FrXDYoMj1OasXV
 +2+0avGwijZb/5O2Tnz9pXGfB4ir/+LX71wf9HcxVUzGw7fklmds5DpMy+T2+8Qs2ab9e1gV
 ee3hmElqgFwozivxtorioLUgY8UylHF9SVjz4Y0OdG0VEB2bMW5EJRMrSGWLZV5Td4/Q2xxv
 isx17IJt4KhcicQ1JQn2wDQa+aBc4WQ4hztVPudLzh5iX55eLyxiAq//Eugx+PzUsS5zUtHo
 ylYn9TMqH0D2RLe58iIR/Zg8UmsxCuC2gPP5uxAIU05i6zWIIMizL4ojpcfr1jPEyvslEj1j
 KKabFso9vWp5uj9Y7jrooeQO5J1hwz6KKgihMKyDOQiPgQQXWWX4/qw2KPt8ED/Xb5ElOc5k
 rPDv5DfPckbo6m5DBJL3Ys78Ba/Cium0MwfnXkaMFJJYBKHgJbtO1HJOP34CO2wg1WokDty3
 /DGPKDtDozDLnXClLrtZ7l960lbyAo8ydBQ+YhYBa0GIPL2QkPxtdrYAQElMwGs3errFNFw2
 pkdVG+PGKOVLr7evF6S6u8uJ+SAfIoVtyz8K/gh6f7ul3g5mVoFcKip3JoXaGq3HvV6L0mFb
 3fhmcoBHnsQvgYkUuPllUCCXSZJZ3muR6I8+i07CIW+AIfHR4CthqGB3SiiEp1VeG9GEFaMH
 mnsd4ifRfcMZzydItV7njwHS7ehUYkh2g+qtAPgzLpnNOXUqWU2r5Xmgel09e3Okllm5C50B
 sXFizqlUmpu2G4EWmllj+hEvUVhxwLbguBDiPtCGIkWuq4hbw==
IronPort-HdrOrdr: A9a23:ywJm26H684XPhGVApLqE1ceALOsnbusQ8zAXPo5KOHlom6Oj5q
 eTdZggpHzJYXMqKQkdcK67Sc+9qBrnnPYfgbX5f43SJzUO0FHIEGgI1/qH/9SPIVydygef78
 pdmmpFYuEYwWIUsS+D2njALz/o+rXozJyV
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 v3] media: atomisp: fix the uninitialized use and rename "retvalue"
Date:   Fri, 25 Jun 2021 05:38:56 +0000
Message-Id: <20210625053858.3862-1-yzhai003@ucr.edu>
In-Reply-To: <20210624031719.11157-1-yzhai003@ucr.edu>
References: <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.

Fixes: ad85094 (media / atomisp: fix the uninitialized use of model ID)
Signed-off-by: Yizhuo <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.17.1