[PATCH] usb: chipidea: npcm: keep the ci_hdrc platform device for removal

[PATCH] usb: chipidea: npcm: keep the ci_hdrc platform device for removal

[Wentao Liang]

npcm_udc_probe() creates the ci_hdrc platform device with
ci_hdrc_add_device() and stores it only in the local plat_ci variable.
The npcm_udc_data::ci field that npcm_udc_remove() passes to
ci_hdrc_remove_device() is never assigned, so it stays NULL.

ci_hdrc_remove_device() therefore never unregisters the device created
during probe.  Both the platform device and the reference it holds on
its parent are leaked on every unbind, and the UDC core structures are
never torn down.

Store the returned device in ci->ci.

Fixes: 70f13579c2f7 ("usb: chipidea: Add support for NPCM")
Cc: stable@vger.kernel.org
Assisted-by: DeepSeek-V4.1-Flash and OpenAI Codex
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
---
 drivers/usb/chipidea/ci_hdrc_npcm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/usb/chipidea/ci_hdrc_npcm.c b/drivers/usb/chipidea/ci_hdrc_npcm.c
index e52a2b05cbe2..8ad8797742f1 100644
--- a/drivers/usb/chipidea/ci_hdrc_npcm.c
+++ b/drivers/usb/chipidea/ci_hdrc_npcm.c
@@ -70,6 +70,8 @@ static int npcm_udc_probe(struct platform_device *pdev)
 		goto clk_err;
 	}
 
+	ci->ci = plat_ci;
+
 	pm_runtime_no_callbacks(dev);
 	pm_runtime_enable(dev);
 
-- 
2.34.1

Re: [PATCH] usb: chipidea: npcm: keep the ci_hdrc platform device for removal

[sashiko-bot]

> npcm_udc_probe() creates the ci_hdrc platform device with
> ci_hdrc_add_device() and stores it only in the local plat_ci variable.
> The npcm_udc_data::ci field that npcm_udc_remove() passes to
> ci_hdrc_remove_device() is never assigned, so it stays NULL.
> 
> ci_hdrc_remove_device() therefore never unregisters the device created
> during probe.  Both the platform device and the reference it holds on
> its parent are leaked on every unbind, and the UDC core structures are
> never torn down.
> 
> Store the returned device in ci->ci.
> 
> Fixes: 70f13579c2f7 ("usb: chipidea: Add support for NPCM")
> Cc: stable@vger.kernel.org
> Assisted-by: DeepSeek-V4.1-Flash and OpenAI Codex
> Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>

Sashiko has reviewed this patch and found no issues.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261104021456.1468462-1-vulab@iscas.ac.cn?part=1

Re: [PATCH] usb: chipidea: npcm: keep the ci_hdrc platform device for removal

[Peter Chen]

On 26-11-04 02:14:56, Wentao Liang wrote:
> npcm_udc_probe() creates the ci_hdrc platform device with
> ci_hdrc_add_device() and stores it only in the local plat_ci variable.
> The npcm_udc_data::ci field that npcm_udc_remove() passes to
> ci_hdrc_remove_device() is never assigned, so it stays NULL.
> 
> ci_hdrc_remove_device() therefore never unregisters the device created
> during probe.  Both the platform device and the reference it holds on
> its parent are leaked on every unbind, and the UDC core structures are
> never torn down.
> 
> Store the returned device in ci->ci.
> 
> Fixes: 70f13579c2f7 ("usb: chipidea: Add support for NPCM")
> Cc: stable@vger.kernel.org
> Assisted-by: DeepSeek-V4.1-Flash and OpenAI Codex
> Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>

Acked-by: Peter Chen <peter.chen@kernel.org>

Peter
> ---
>  drivers/usb/chipidea/ci_hdrc_npcm.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/usb/chipidea/ci_hdrc_npcm.c b/drivers/usb/chipidea/ci_hdrc_npcm.c
> index e52a2b05cbe2..8ad8797742f1 100644
> --- a/drivers/usb/chipidea/ci_hdrc_npcm.c
> +++ b/drivers/usb/chipidea/ci_hdrc_npcm.c
> @@ -70,6 +70,8 @@ static int npcm_udc_probe(struct platform_device *pdev)
>  		goto clk_err;
>  	}
>  
> +	ci->ci = plat_ci;
> +
>  	pm_runtime_no_callbacks(dev);
>  	pm_runtime_enable(dev);
>  
> -- 
> 2.34.1
> 
> 

-- 

Thanks,
Peter Chen