All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miaoqian Lin <linmq006@gmail.com>
To: "Marek Behún" <kabel@kernel.org>, "Arnd Bergmann" <arnd@arndb.de>,
	linux-kernel@vger.kernel.org
Cc: linmq006@gmail.com
Subject: [PATCH] firmware: turris-mox-rwtm: Fix return value check of wait_for_completion_timeout
Date: Tue, 12 Apr 2022 03:12:55 +0000	[thread overview]
Message-ID: <20220412031256.23908-1-linmq006@gmail.com> (raw)

wait_for_completion_timeout() returns unsigned long not int.
It returns 0 if timed out, and positive if completed.
The check for < 0 is ambiguous and should be == 0 here
indicating timeout which is the only error case.

Fixes: 389711b37493 ("firmware: Add Turris Mox rWTM firmware driver")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/firmware/turris-mox-rwtm.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/firmware/turris-mox-rwtm.c b/drivers/firmware/turris-mox-rwtm.c
index c2d34dc8ba46..2090afe00b7f 100644
--- a/drivers/firmware/turris-mox-rwtm.c
+++ b/drivers/firmware/turris-mox-rwtm.c
@@ -193,15 +193,16 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)
 	struct armada_37xx_rwtm_tx_msg msg;
 	struct armada_37xx_rwtm_rx_msg *reply = &rwtm->reply;
 	int ret;
+	unsigned long time_left;
 
 	msg.command = MBOX_CMD_BOARD_INFO;
 	ret = mbox_send_message(rwtm->mbox, &msg);
 	if (ret < 0)
 		return ret;
 
-	ret = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
-	if (ret < 0)
-		return ret;
+	time_left = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
+	if (time_left == 0)
+		return -ETIMEDOUT;
 
 	ret = mox_get_status(MBOX_CMD_BOARD_INFO, reply->retval);
 	if (ret == -ENODATA) {
@@ -235,9 +236,9 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)
 	if (ret < 0)
 		return ret;
 
-	ret = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
-	if (ret < 0)
-		return ret;
+	time_left = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
+	if (time_left == 0)
+		return -ETIMEDOUT;
 
 	ret = mox_get_status(MBOX_CMD_ECDSA_PUB_KEY, reply->retval);
 	if (ret == -ENODATA) {
@@ -264,6 +265,7 @@ static int check_get_random_support(struct mox_rwtm *rwtm)
 {
 	struct armada_37xx_rwtm_tx_msg msg;
 	int ret;
+	unsigned long time_left;
 
 	msg.command = MBOX_CMD_GET_RANDOM;
 	msg.args[0] = 1;
@@ -274,9 +276,9 @@ static int check_get_random_support(struct mox_rwtm *rwtm)
 	if (ret < 0)
 		return ret;
 
-	ret = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
-	if (ret < 0)
-		return ret;
+	time_left = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
+	if (time_left == 0)
+		return -ETIMEDOUT;
 
 	return mox_get_status(MBOX_CMD_GET_RANDOM, rwtm->reply.retval);
 }
-- 
2.17.1


             reply	other threads:[~2022-04-12  3:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-12  3:12 Miaoqian Lin [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-04-11 10:45 [PATCH] firmware: turris-mox-rwtm: Fix return value check of wait_for_completion_timeout Miaoqian Lin
2022-04-11 16:07 ` Marek Behún

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220412031256.23908-1-linmq006@gmail.com \
    --to=linmq006@gmail.com \
    --cc=arnd@arndb.de \
    --cc=kabel@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.