usb: dwc3: qcom: Fix NULL vs IS_ERR checking in dwc3_qcom_probe

[ Upstream commit b52fe2dbb3e655eb1483000adfab68a219549e13 ]

Since the acpi_create_platform_device() function may return error
pointers, dwc3_qcom_create_urs_usb_platdev() function may return error
pointers too. Using IS_ERR_OR_NULL() to check the return value to fix this.

Fixes: c25c210f590e ("usb: dwc3: qcom: add URS Host support for sdm845 ACPI boot")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Link: https://lore.kernel.org/r/20211222111823.22887-1-linmq006@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 2a29e2f681fe6f0e8285362d41db0ac3cb034927..504f8af4d0f80ba319276d9c8347a6c0d5b2f38c 100644 (file)
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -764,9 +764,12 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 
                if (qcom->acpi_pdata->is_urs) {
                        qcom->urs_usb = dwc3_qcom_create_urs_usb_platdev(dev);
-                       if (!qcom->urs_usb) {
+                       if (IS_ERR_OR_NULL(qcom->urs_usb)) {
                                dev_err(dev, "failed to create URS USB platdev\n");
-                               return -ENODEV;
+                               if (!qcom->urs_usb)
+                                       return -ENODEV;
+                               else
+                                       return PTR_ERR(qcom->urs_usb);
                        }
                }
        }