Skip to contentSkip to conversation

remoteproc: qcom: wcss: Fix return value check in q6v5_wcss_init_mmio()

PATCH Applied 'w00385741 3 participants 3 messages Mar 19, 2021 – May 26, 2021

Subsystems (3)
lore
Share & tools
lore

'w00385741

author
#0 lore raw

PATCH 1/1 remoteproc: qcom: wcss: Fix return value check in q6v5_wcss_init_mmio()

From: Wei Yongjun <[email protected]>

In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test.

Fixes 0af65b9b915e ("remoteproc: qcom: wcss: Add non pas wcss Q6 support for QCS404")
---
 drivers/remoteproc/qcom_q6v5_wcss.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/remoteproc/qcom_q6v5_wcss.c +2 -2
index 71ec1a451e35..6f7d940d4431 100644
@@ -829,8 +829,8 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss,
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qdsp6");
 	wcss->reg_base = devm_ioremap(&pdev->dev, res->start,
 				      resource_size(res));
-	if (IS_ERR(wcss->reg_base))
-		return PTR_ERR(wcss->reg_base);
+	if (!wcss->reg_base)
+		return -ENOMEM;
 
 	if (wcss->version == WCSS_IPQ8074) {
 		res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rmb");
#1 lore raw
This patch was applied to andersson/remoteproc.git (refs/heads/for-next):

Hello:

This patch was applied to andersson/remoteproc.git (refs/heads/for-next):

Quoted 11 lines · On Fri, 19 Mar 2021 09:41:00 +0000 you wrote:

From: Wei Yongjun <[email protected]>

In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test.

Fixes 0af65b9b915e ("remoteproc: qcom: wcss: Add non pas wcss Q6 support for QCS404")

[...]

Here is the summary with links:
- [-next] remoteproc: qcom: wcss: Fix return value check in q6v5_wcss_init_mmio()

    https://git.kernel.org/andersson/remoteproc/c/859fd2418b4b

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

#2 lore raw
In reply to 'w00385741
This patch was applied to qcom/linux.git (refs/heads/for-next):

Hello:

This patch was applied to qcom/linux.git (refs/heads/for-next):

Quoted 11 lines · On Fri, 19 Mar 2021 09:41:00 +0000 you wrote:

From: Wei Yongjun <[email protected]>

In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test.

Fixes 0af65b9b915e ("remoteproc: qcom: wcss: Add non pas wcss Q6 support for QCS404")

[...]

Here is the summary with links:
- [-next] remoteproc: qcom: wcss: Fix return value check in q6v5_wcss_init_mmio()

    https://git.kernel.org/qcom/c/859fd2418b4b

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html