* [PATCH next] usb: dwc3: qcom: Fix error handling in probe
@ 2025-04-23 8:23 Dan Carpenter
2025-04-23 12:41 ` Bjorn Andersson
2025-04-24 23:32 ` Thinh Nguyen
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2025-04-23 8:23 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Thinh Nguyen, Greg Kroah-Hartman, linux-arm-msm, linux-usb,
linux-kernel, kernel-janitors
There are two issues:
1) Return -EINVAL if platform_get_resource() fails. Don't return
success.
2) The devm_ioremap() function doesn't return error pointers, it returns
NULL. Update the check.
Fixes: 1881a32fe14d ("usb: dwc3: qcom: Transition to flattened model")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/usb/dwc3/dwc3-qcom.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index d512002e1e88..b63fcaf823aa 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -740,15 +740,17 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
}
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!r)
+ if (!r) {
+ ret = -EINVAL;
goto clk_disable;
+ }
res = *r;
res.end = res.start + SDM845_QSCRATCH_BASE_OFFSET;
qcom->qscratch_base = devm_ioremap(dev, res.end, SDM845_QSCRATCH_SIZE);
- if (IS_ERR(qcom->qscratch_base)) {
- dev_err(dev, "failed to map qscratch region: %pe\n", qcom->qscratch_base);
- ret = PTR_ERR(qcom->qscratch_base);
+ if (!qcom->qscratch_base) {
+ dev_err(dev, "failed to map qscratch region\n");
+ ret = -ENOMEM;
goto clk_disable;
}
--
2.47.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH next] usb: dwc3: qcom: Fix error handling in probe
2025-04-23 8:23 [PATCH next] usb: dwc3: qcom: Fix error handling in probe Dan Carpenter
@ 2025-04-23 12:41 ` Bjorn Andersson
2025-04-24 23:32 ` Thinh Nguyen
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2025-04-23 12:41 UTC (permalink / raw)
To: Dan Carpenter
Cc: Bjorn Andersson, Thinh Nguyen, Greg Kroah-Hartman, linux-arm-msm,
linux-usb, linux-kernel, kernel-janitors
On Wed, Apr 23, 2025 at 11:23:53AM +0300, Dan Carpenter wrote:
> There are two issues:
> 1) Return -EINVAL if platform_get_resource() fails. Don't return
> success.
> 2) The devm_ioremap() function doesn't return error pointers, it returns
> NULL. Update the check.
>
> Fixes: 1881a32fe14d ("usb: dwc3: qcom: Transition to flattened model")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Bjorn Andersson <andersson@kernel.org>
Regards,
Bjorn
> ---
> drivers/usb/dwc3/dwc3-qcom.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index d512002e1e88..b63fcaf823aa 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -740,15 +740,17 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
> }
>
> r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (!r)
> + if (!r) {
> + ret = -EINVAL;
> goto clk_disable;
> + }
> res = *r;
> res.end = res.start + SDM845_QSCRATCH_BASE_OFFSET;
>
> qcom->qscratch_base = devm_ioremap(dev, res.end, SDM845_QSCRATCH_SIZE);
> - if (IS_ERR(qcom->qscratch_base)) {
> - dev_err(dev, "failed to map qscratch region: %pe\n", qcom->qscratch_base);
> - ret = PTR_ERR(qcom->qscratch_base);
> + if (!qcom->qscratch_base) {
> + dev_err(dev, "failed to map qscratch region\n");
> + ret = -ENOMEM;
> goto clk_disable;
> }
>
> --
> 2.47.2
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH next] usb: dwc3: qcom: Fix error handling in probe
2025-04-23 8:23 [PATCH next] usb: dwc3: qcom: Fix error handling in probe Dan Carpenter
2025-04-23 12:41 ` Bjorn Andersson
@ 2025-04-24 23:32 ` Thinh Nguyen
1 sibling, 0 replies; 3+ messages in thread
From: Thinh Nguyen @ 2025-04-24 23:32 UTC (permalink / raw)
To: Dan Carpenter
Cc: Bjorn Andersson, Thinh Nguyen, Greg Kroah-Hartman,
linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
On Wed, Apr 23, 2025, Dan Carpenter wrote:
> There are two issues:
> 1) Return -EINVAL if platform_get_resource() fails. Don't return
> success.
> 2) The devm_ioremap() function doesn't return error pointers, it returns
> NULL. Update the check.
>
> Fixes: 1881a32fe14d ("usb: dwc3: qcom: Transition to flattened model")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/usb/dwc3/dwc3-qcom.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index d512002e1e88..b63fcaf823aa 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -740,15 +740,17 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
> }
>
> r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (!r)
> + if (!r) {
> + ret = -EINVAL;
> goto clk_disable;
> + }
> res = *r;
> res.end = res.start + SDM845_QSCRATCH_BASE_OFFSET;
>
> qcom->qscratch_base = devm_ioremap(dev, res.end, SDM845_QSCRATCH_SIZE);
> - if (IS_ERR(qcom->qscratch_base)) {
> - dev_err(dev, "failed to map qscratch region: %pe\n", qcom->qscratch_base);
> - ret = PTR_ERR(qcom->qscratch_base);
> + if (!qcom->qscratch_base) {
> + dev_err(dev, "failed to map qscratch region\n");
> + ret = -ENOMEM;
> goto clk_disable;
> }
>
> --
> 2.47.2
>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Thanks,
Thinh
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-24 23:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-23 8:23 [PATCH next] usb: dwc3: qcom: Fix error handling in probe Dan Carpenter
2025-04-23 12:41 ` Bjorn Andersson
2025-04-24 23:32 ` Thinh Nguyen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox