USB: dwc3: qcom: fix software node leak on probe errors

Make sure to remove the software node also on (ACPI) probe errors to
avoid leaking the underlying resources.

Note that the software node is only used for ACPI probe so the driver
unbind tear down is updated to match probe.

Fixes: 8dc6e6dd1bee ("usb: dwc3: qcom: Constify the software node")
Cc: stable@vger.kernel.org      # 5.12
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20231117173650.21161-3-johan+linaro@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 313a8ac2bd6017744feb8baecbbf2615cc7f146c..a9bce4548019fd3c294d533bfa4935866ed78042 100644 (file)
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -928,10 +928,12 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 interconnect_exit:
        dwc3_qcom_interconnect_exit(qcom);
 depopulate:
-       if (np)
+       if (np) {
                of_platform_depopulate(&pdev->dev);
-       else
+       } else {
+               device_remove_software_node(&qcom->dwc3->dev);
                platform_device_del(qcom->dwc3);
+       }
        platform_device_put(qcom->dwc3);
 clk_disable:
        for (i = qcom->num_clocks - 1; i >= 0; i--) {
@@ -951,11 +953,12 @@ static void dwc3_qcom_remove(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        int i;
 
-       device_remove_software_node(&qcom->dwc3->dev);
-       if (np)
+       if (np) {
                of_platform_depopulate(&pdev->dev);
-       else
+       } else {
+               device_remove_software_node(&qcom->dwc3->dev);
                platform_device_del(qcom->dwc3);
+       }
        platform_device_put(qcom->dwc3);
 
        for (i = qcom->num_clocks - 1; i >= 0; i--) {