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: sV0leLweAYBHxHPaUxgj01+4nsLoHUAFSVAPxylBcRtD9Xk8qfSqOVe3LmbXoOQTGQ4YjJEQdo
 TCf3SxT6sdSKvUtmv0W1ybZkXgNlEKy95By4CKLob2AI0rRWPfvg9/2SPiPxIIqafzCHSVwgva
 MWCMm3dj+ZOeMU1JEH/JDnAkGipapKe+edo6ozSTNyMuOb7UKgnI0TvJfYZlEGkG9wbdi2jOc2
 3q4ppxJDfFWW/QJoBkGQbRe3i5rnu4bPxVeHuo6BUmb2DxTCTWu6TsFzFR+ED+uqYEsUVLef00
 1kTJIEjmkgvUIo7hc+NmyeVn
IronPort-PHdr: A9a23:abcPAxK9kTpxvhQgXtmcuJxmWUAX0o4c3iYr45Yqw4hDbr6kt8y7e
 hCFvbM20xSRAs3y0LFts6LuqafuWGgNs96qkUspV9hybSIDktgchAc6AcSIWgXRJf/uaDEmT
 owZDAc2t360PlJIF8ngelbcvmO97SIIGhX4KAF5Ovn5FpTdgsipy+y+4ZPebgdHiDahY755M
 Qm7oxjWusQKm4VpN7w/ygHOontGeuRWwX1nKFeOlBvi5cm+4YBu/T1It/0u68BPX6P6f78lT
 bNDFzQpL3o15MzwuhbdSwaE+2YRXX8XkhpMBAjF8Q36U5LsuSb0quZxxC+XNtDtQLsqRTqt8
 btkSB7wiCcGKTE59n3Xitdth65fuR6tugBzz5LRbIyTMfp+f7jdfcgbRWpHUcZaSjJPDJqhZ
 IsBDuoOI+JYoJTgrFcKoxayGQygCeXoxTJUiHL6wbA23/09HQ3bwQcsG88CvXTRoNjzKawcU
 /26zLPQwDvDcf1YxDnz5ovPfB8jr/GBRq58fdbLxEUzDQ7JkkmcpIr4ND2VzOQNtG2b4vJiW
 uKuim8nqxxxoj+yzcoriojIh4IVxUrF9Sll3Io4K8a1SFNnbt6+CpdfqTyVN5ZvT84kXmpnt
 zo0xKcctp6nYCgF1o4nxxjHZvKHc4aE/x3tWeeNLTl4i3xoZLGyiha9/0Wk1+DxS8q53UtKo
 ydbnNfBuHAA2hPO58aIV/Zw40Ss1SqL2g3T9OxJJ10/m6nDK5M53LI8ip4evV7AEyL2gkn6k
 rKae0o+9uS17+nqYa3qqoKdOoJwkA3yLKojl8ylDegmMAUCRXaX9fqy2bDl4Eb3Wq9Fjucsn
 ancqJ3aIMMbqbOnDAJNyYYj7gq/Dy+h0NQFgXkLNFJFdwyDj4juI1zOJer3Dfa7g1i1iDdrw
 +3KMqTvApnQKnXOk63tfbl6605bxwozyc5Q64hIBbEGJfL/Qk7xtNrGAR8lKwG43frrBdFn2
 o4dWW+DGLGVPL7dvFOS++4iJ+qBaJcQuDnnKvgl4/DujWU+mV8YZaSo3ZoWaHCiEfRnP0mVf
 XThj8wcEWgWpAoyVvLlh0CfUTJLfXa9Q7o85i0nCIKhFYrDQoGtgLqc3Ca0B5FWZX5JCkqKE
 Xj2c4WJQOkMaC2MLc97iDAEVqauS5Un1R6wsA/20b1nLvDb+n5Qm4jk0Y1E5v/TiBZ6oS1mD
 82ciznWZ3x/hCUFSyJgj/M3mlB01lrWifswuPdfD9EGoq4UOjo=
IronPort-HdrOrdr: A9a23:pjn0ZqOwjRk9hMBcTvyjsMiBIKoaSvp037Dk7TEVdfU7SL3+qy
 nDpoV56fawskdoZJhfo6HnBEDoexq1nv5ICMsqTMyftWHd2VdAR7sSibcKrQeQeREWNdQx6U
 6jScJD4RHLYmSS9fyKmTVQ2uxNruW6zA==
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 v4] media: atomisp: fix the uninitialized use and rename "retvalue"
Date:   Fri, 23 Jul 2021 00:36:04 +0000
Message-Id: <20210723003607.64179-1-yzhai003@ucr.edu>
In-Reply-To: <20210723085145.1ce7ee5c@canb.auug.org.au>
References: <20210723085145.1ce7ee5c@canb.auug.org.au>
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 <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