xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: dwc3: qcom: fix ACPI platform device leak

Browse Source 
[ Upstream commit 9cf87666fc6e08572341fe08ecd909935998fbbd ]

Make sure to free the "urs" platform device, which is created for some
ACPI platforms, on probe errors and on driver unbind.

Compile-tested only.

Fixes: c25c210f590e ("usb: dwc3: qcom: add URS Host support for sdm845 ACPI boot")
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Acked-by: Andrew Halaney <ahalaney@redhat.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Link: https://lore.kernel.org/r/20231117173650.21161-4-johan+linaro@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Johan Hovold
2023-11-17 18:36:50 +01:00
committed by Greg Kroah-Hartman
parent 68fe711312
commit cbfa5aadd6
1 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/usb/dwc3/dwc3-qcom.c
View File

@@ -699,9 +699,9 @@ node_put:
return ret; return ret;
} }
static struct platform_device * static struct platform_device *dwc3_qcom_create_urs_usb_platdev(struct device *dev)
dwc3_qcom_create_urs_usb_platdev(struct device *dev)
{ {
struct platform_device *urs_usb = NULL;
struct fwnode_handle *fwh; struct fwnode_handle *fwh;
struct acpi_device *adev; struct acpi_device *adev;
char name[8]; char name[8];
@@ -721,9 +721,26 @@ dwc3_qcom_create_urs_usb_platdev(struct device *dev)
adev = to_acpi_device_node(fwh); adev = to_acpi_device_node(fwh);
if (!adev) if (!adev)
return NULL; goto err_put_handle;
return acpi_create_platform_device(adev, NULL); urs_usb = acpi_create_platform_device(adev, NULL);
if (IS_ERR_OR_NULL(urs_usb))
goto err_put_handle;
return urs_usb;
err_put_handle:
fwnode_handle_put(fwh);
return urs_usb;
}
static void dwc3_qcom_destroy_urs_usb_platdev(struct platform_device *urs_usb)
{
struct fwnode_handle *fwh = urs_usb->dev.fwnode;
platform_device_unregister(urs_usb);
fwnode_handle_put(fwh);
} }
static int dwc3_qcom_probe(struct platform_device *pdev) static int dwc3_qcom_probe(struct platform_device *pdev)
@@ -808,13 +825,13 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
if (IS_ERR(qcom->qscratch_base)) { if (IS_ERR(qcom->qscratch_base)) {
dev_err(dev, "failed to map qscratch, err=%d\n", ret); dev_err(dev, "failed to map qscratch, err=%d\n", ret);
ret = PTR_ERR(qcom->qscratch_base); ret = PTR_ERR(qcom->qscratch_base);
goto clk_disable; goto free_urs;
} }
ret = dwc3_qcom_setup_irq(pdev); ret = dwc3_qcom_setup_irq(pdev);
if (ret) { if (ret) {
dev_err(dev, "failed to setup IRQs, err=%d\n", ret); dev_err(dev, "failed to setup IRQs, err=%d\n", ret);
goto clk_disable; goto free_urs;
} }
/* /*
@@ -833,7 +850,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(dev, "failed to register DWC3 Core, err=%d\n", ret); dev_err(dev, "failed to register DWC3 Core, err=%d\n", ret);
goto clk_disable; goto free_urs;
} }
ret = dwc3_qcom_interconnect_init(qcom); ret = dwc3_qcom_interconnect_init(qcom);
@@ -867,6 +884,9 @@ depopulate:
else else
platform_device_del(qcom->dwc3); platform_device_del(qcom->dwc3);
platform_device_put(qcom->dwc3); platform_device_put(qcom->dwc3);
free_urs:
if (qcom->urs_usb)
dwc3_qcom_destroy_urs_usb_platdev(qcom->urs_usb);
clk_disable: clk_disable:
for (i = qcom->num_clocks - 1; i >= 0; i--) { for (i = qcom->num_clocks - 1; i >= 0; i--) {
clk_disable_unprepare(qcom->clks[i]); clk_disable_unprepare(qcom->clks[i]);
@@ -891,6 +911,9 @@ static int dwc3_qcom_remove(struct platform_device *pdev)
platform_device_del(qcom->dwc3); platform_device_del(qcom->dwc3);
platform_device_put(qcom->dwc3); platform_device_put(qcom->dwc3);
if (qcom->urs_usb)
dwc3_qcom_destroy_urs_usb_platdev(qcom->urs_usb);
for (i = qcom->num_clocks - 1; i >= 0; i--) { for (i = qcom->num_clocks - 1; i >= 0; i--) {
clk_disable_unprepare(qcom->clks[i]); clk_disable_unprepare(qcom->clks[i]);
clk_put(qcom->clks[i]); clk_put(qcom->clks[i]);