linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] remoteproc: qcom: wcss: Fix wrong pointer passed to PTR_ERR()
@ 2021-03-25  3:08 'Wei Yongjun
  2021-03-25  7:27 ` Dan Carpenter
  0 siblings, 1 reply; 2+ messages in thread
From: 'Wei Yongjun @ 2021-03-25  3:08 UTC (permalink / raw)
  To: weiyongjun1, Andy Gross, Bjorn Andersson, Ohad Ben-Cohen,
	Mathieu Poirier, Philipp Zabel, Govind Singh
  Cc: linux-arm-msm, linux-remoteproc, kernel-janitors, Hulk Robot

From: Wei Yongjun <weiyongjun1@huawei.com>

PTR_ERR should access the value just tested by IS_ERR, otherwise
the wrong error code will be returned.

Fixes: 0af65b9b915e ("remoteproc: qcom: wcss: Add non pas wcss Q6 support for QCS404")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 drivers/remoteproc/qcom_q6v5_wcss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index 71ec1a451e35..eda64f86d7b0 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -972,7 +972,7 @@ static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
 		ret = PTR_ERR(wcss->qdsp6ss_axim_cbcr);
 		if (ret != -EPROBE_DEFER)
 			dev_err(wcss->dev, "failed to get axim cbcr clk\n");
-		return PTR_ERR(wcss->qdsp6ss_abhm_cbcr);
+		return PTR_ERR(wcss->qdsp6ss_axim_cbcr);
 	}
 
 	wcss->lcc_bcr_sleep = devm_clk_get(wcss->dev, "lcc_bcr_sleep");


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH -next] remoteproc: qcom: wcss: Fix wrong pointer passed to PTR_ERR()
  2021-03-25  3:08 [PATCH -next] remoteproc: qcom: wcss: Fix wrong pointer passed to PTR_ERR() 'Wei Yongjun
@ 2021-03-25  7:27 ` Dan Carpenter
  0 siblings, 0 replies; 2+ messages in thread
From: Dan Carpenter @ 2021-03-25  7:27 UTC (permalink / raw)
  To: 'Wei Yongjun
  Cc: Andy Gross, Bjorn Andersson, Ohad Ben-Cohen, Mathieu Poirier,
	Philipp Zabel, Govind Singh, linux-arm-msm, linux-remoteproc,
	kernel-janitors, Hulk Robot

On Thu, Mar 25, 2021 at 03:08:57AM +0000, 'Wei Yongjun wrote:
> From: Wei Yongjun <weiyongjun1@huawei.com>
> 
> PTR_ERR should access the value just tested by IS_ERR, otherwise
> the wrong error code will be returned.
> 
> Fixes: 0af65b9b915e ("remoteproc: qcom: wcss: Add non pas wcss Q6 support for QCS404")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
>  drivers/remoteproc/qcom_q6v5_wcss.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
> index 71ec1a451e35..eda64f86d7b0 100644
> --- a/drivers/remoteproc/qcom_q6v5_wcss.c
> +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
> @@ -972,7 +972,7 @@ static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
>  		ret = PTR_ERR(wcss->qdsp6ss_axim_cbcr);
>  		if (ret != -EPROBE_DEFER)
>  			dev_err(wcss->dev, "failed to get axim cbcr clk\n");
> -		return PTR_ERR(wcss->qdsp6ss_abhm_cbcr);
> +		return PTR_ERR(wcss->qdsp6ss_axim_cbcr);

Just return ret;

(Don't worry about being consistent when the other returns are doing it
wrong).

regards,
dan carpenter



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-03-25  7:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-25  3:08 [PATCH -next] remoteproc: qcom: wcss: Fix wrong pointer passed to PTR_ERR() 'Wei Yongjun
2021-03-25  7:27 ` Dan Carpenter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).