usb: dwc3: qcom: Fix error handling in probe
authorDan Carpenter <dan.carpenter@linaro.org>
Wed, 23 Apr 2025 08:23:53 +0000 (11:23 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Apr 2025 11:22:25 +0000 (13:22 +0200)
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>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/aAijmfAph0FlTqg6@stanley.mountain
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/dwc3-qcom.c

index cbba11589cd0e9968869f2b16544de24254ed487..20c00ba3bc3d29dfe1e11e38dedea0c94aaa6a81 100644 (file)
@@ -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;
        }