mirror of
https://github.com/hardkernel/linux.git
synced 2026-03-25 20:10:23 +09:00
USB: dwc3: qcom: fix software node leak on probe errors
commit 9feefbf57d92e8ee293dad67585d351c7d0b6e37 upstream.
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: 8dc6e6dd1b ("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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
98f0e9b627
commit
eb17fb4b16
@@ -883,10 +883,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);
|
||||
free_urs:
|
||||
if (qcom->urs_usb)
|
||||
@@ -909,11 +911,12 @@ static int 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);
|
||||
|
||||
if (qcom->urs_usb)
|
||||
|
||||
Reference in New Issue
Block a user