From: Sean Young <sean@mess.org>
Date: Wed, 22 Apr 2020 19:16:46 +0000 (+0200)
Subject: media: si2157: ensure wait_status is initialized
X-Git-Tag: v5.8-rc1~162^2~223
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7ba9f34800aee62e1ffcd4386a421116e09f4fe;p=thirdparty%2Fkernel%2Flinux.git

media: si2157: ensure wait_status is initialized

smatch reports wait_status is uninitialized, because smatch cannot assume
the loop body is ever executed.

Clarify the code so that wait_status is retrieved at least once.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---

diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index 6b452565dedbd..fefb2625f6558 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -327,7 +327,7 @@ static int si2157_tune_wait(struct i2c_client *client, u8 is_digital)
 	/* wait tuner command complete */
 	start_time = jiffies;
 	timeout = start_time + msecs_to_jiffies(TUN_TIMEOUT);
-	while (!time_after(jiffies, timeout)) {
+	while (1) {
 		ret = i2c_master_recv(client, &wait_status,
 				      sizeof(wait_status));
 		if (ret < 0) {
@@ -337,6 +337,9 @@ static int si2157_tune_wait(struct i2c_client *client, u8 is_digital)
 			goto err_mutex_unlock;
 		}
 
+		if (time_after(jiffies, timeout))
+			break;
+
 		/* tuner done? */
 		if ((wait_status & 0x81) == 0x81)
 			break;