From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF24418800D; Tue, 30 Jul 2024 16:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722356034; cv=none; b=KSpM6aOtSqJBiKBPTD2FeDUGycPjpyfWuG/yxvJ8ms+Cu6CFTKVB1pmW+C9i2TI3iM+nanfy3lOxnNlaGoljmSqxvRDU9S5EYp9hjzQHUki3M+NyqVuAoeQWISzGQuKLTVA/+v0BFAJv+tMZxSvSJ5P16uV3MDKhKsc/X0zvgWE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722356034; c=relaxed/simple; bh=OaFfzLIIXi229kP/zwqAxTXJxEuhEs/votJnIVD3KnU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EXWLUs7Sw3+CANTW8rfy0wEJR6aHh6cEcY36/5jn0aUw1/hpNZ1gmMkMSpmX3wl4xaNjc1Le3JI2e7fhoc8X/loEGaqik68dYMW/mbxNhNA+sj4+KRongnaVctYypGXUGLlw4rCeWwcrUF18ZuEr3BJiv9nvrQ3PYPZr2MpNmsI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VyfiRH8r; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VyfiRH8r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27BEAC32782; Tue, 30 Jul 2024 16:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722356034; bh=OaFfzLIIXi229kP/zwqAxTXJxEuhEs/votJnIVD3KnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VyfiRH8rRhz5VsbvEsyj/m2JIYCF2ix+dBjs+YsNL7snGGWb7r8RdABo2gd5bwf62 aA8XuGBw/knD4b760t51gopdlyKmIDH6TqFRdC864WXNCNTtigIk+eNm9GakxY5LGM RzM1vQ+ASUmY0LUjGvZfkI7YoODBOQzVfeA3p51w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Marek=20Beh=C3=BAn?= , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Andy Shevchenko , Arnd Bergmann , Sasha Levin Subject: [PATCH 6.6 108/568] firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout() Date: Tue, 30 Jul 2024 17:43:35 +0200 Message-ID: <20240730151644.096680276@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151639.792277039@linuxfoundation.org> References: <20240730151639.792277039@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marek Behún [ Upstream commit 8467cfe821ac3526f7598682ad5f90689fa8cc49 ] The wait_for_completion_timeout() function returns 0 if timed out, and a positive value if completed. Fix the usage of this function. Fixes: 389711b37493 ("firmware: Add Turris Mox rWTM firmware driver") Fixes: 2eab59cf0d20 ("firmware: turris-mox-rwtm: fail probing when firmware does not support hwrng") Signed-off-by: Marek Behún Reviewed-by: Ilpo Järvinen Reviewed-by: Andy Shevchenko Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- drivers/firmware/turris-mox-rwtm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/firmware/turris-mox-rwtm.c b/drivers/firmware/turris-mox-rwtm.c index efd35d308aac9..4b92ac3339872 100644 --- a/drivers/firmware/turris-mox-rwtm.c +++ b/drivers/firmware/turris-mox-rwtm.c @@ -202,9 +202,8 @@ 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; + if (!wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2)) + return -ETIMEDOUT; ret = mox_get_status(MBOX_CMD_BOARD_INFO, reply->retval); if (ret == -ENODATA) { @@ -238,9 +237,8 @@ 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; + if (!wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2)) + return -ETIMEDOUT; ret = mox_get_status(MBOX_CMD_ECDSA_PUB_KEY, reply->retval); if (ret == -ENODATA) { @@ -277,9 +275,8 @@ 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; + if (!wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2)) + return -ETIMEDOUT; return mox_get_status(MBOX_CMD_GET_RANDOM, rwtm->reply.retval); } -- 2.43.0