[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <7hqzxxb975.fsf@baylibre.com>
Date: Wed, 30 Jul 2025 15:33:18 -0700
From: Kevin Hilman <khilman@...libre.com>
To: Johan Hovold <johan@...nel.org>, Greg Kroah-Hartman
<gregkh@...uxfoundation.org>, Thinh Nguyen <Thinh.Nguyen@...opsys.com>,
Bin Liu <b-liu@...com>
Cc: Shawn Guo <shawnguo@...nel.org>, Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>, Fabio Estevam
<festevam@...il.com>, Neil Armstrong <neil.armstrong@...aro.org>, Jerome
Brunet <jbrunet@...libre.com>, Martin Blumenstingl
<martin.blumenstingl@...glemail.com>, linux-usb@...r.kernel.org,
linux-kernel@...r.kernel.org, Johan Hovold <johan@...nel.org>,
stable@...r.kernel.org, Roger Quadros <rogerq@...nel.org>
Subject: Re: [PATCH 4/5] usb: musb: omap2430: fix device leak at unbind
Johan Hovold <johan@...nel.org> writes:
> Make sure to drop the reference to the control device taken by
> of_find_device_by_node() during probe when the driver is unbound.
>
> Fixes: 8934d3e4d0e7 ("usb: musb: omap2430: Don't use omap_get_control_dev()")
> Cc: stable@...r.kernel.org # 3.13
> Cc: Roger Quadros <rogerq@...nel.org>
> Signed-off-by: Johan Hovold <johan@...nel.org>
Reviewed-by: Kevin Hilman <khilman@...libre.com>
> ---
> drivers/usb/musb/omap2430.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
> index 2970967a4fd2..36f756f9b7f6 100644
> --- a/drivers/usb/musb/omap2430.c
> +++ b/drivers/usb/musb/omap2430.c
> @@ -400,7 +400,7 @@ static int omap2430_probe(struct platform_device *pdev)
> ret = platform_device_add_resources(musb, pdev->resource, pdev->num_resources);
> if (ret) {
> dev_err(&pdev->dev, "failed to add resources\n");
> - goto err2;
> + goto err_put_control_otghs;
> }
>
> if (populate_irqs) {
> @@ -413,7 +413,7 @@ static int omap2430_probe(struct platform_device *pdev)
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!res) {
> ret = -EINVAL;
> - goto err2;
> + goto err_put_control_otghs;
> }
>
> musb_res[i].start = res->start;
> @@ -441,14 +441,14 @@ static int omap2430_probe(struct platform_device *pdev)
> ret = platform_device_add_resources(musb, musb_res, i);
> if (ret) {
> dev_err(&pdev->dev, "failed to add IRQ resources\n");
> - goto err2;
> + goto err_put_control_otghs;
> }
> }
>
> ret = platform_device_add_data(musb, pdata, sizeof(*pdata));
> if (ret) {
> dev_err(&pdev->dev, "failed to add platform_data\n");
> - goto err2;
> + goto err_put_control_otghs;
> }
>
> pm_runtime_enable(glue->dev);
> @@ -463,7 +463,9 @@ static int omap2430_probe(struct platform_device *pdev)
>
> err3:
> pm_runtime_disable(glue->dev);
> -
> +err_put_control_otghs:
> + if (!IS_ERR(glue->control_otghs))
> + put_device(glue->control_otghs);
> err2:
> platform_device_put(musb);
>
> @@ -477,6 +479,8 @@ static void omap2430_remove(struct platform_device *pdev)
>
> platform_device_unregister(glue->musb);
> pm_runtime_disable(glue->dev);
> + if (!IS_ERR(glue->control_otghs))
> + put_device(glue->control_otghs);
> }
>
> #ifdef CONFIG_PM
> --
> 2.49.1
Powered by blists - more mailing lists