2020-11-17 01:13:35

by Yu Kuai

Subject: [PATCH] soc: amlogic: canvas: add missing put_device() call in meson_canvas_get()

if of_find_device_by_node() succeed, meson_canvas_get() doesn't have
a corresponding put_device(). Thus add put_device() to fix the exception
handling for this function implementation.

Fixes: commit 382f8be04551 ("soc: amlogic: canvas: Fix meson_canvas_get when probe failed")
Signed-off-by: Yu Kuai <[email protected]>
---
drivers/soc/amlogic/meson-canvas.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson-canvas.c
index c655f5f92b12..d0329ad170d1 100644
--- a/drivers/soc/amlogic/meson-canvas.c
+++ b/drivers/soc/amlogic/meson-canvas.c
@@ -72,8 +72,10 @@ struct meson_canvas *meson_canvas_get(struct device *dev)
* current state, this driver probe cannot return -EPROBE_DEFER
*/
canvas = dev_get_drvdata(&canvas_pdev->dev);
- if (!canvas)
+ if (!canvas) {
+ put_device(&canvas_pdev->dev);
return ERR_PTR(-EINVAL);
+ }

return canvas;
}
--
2.25.4

2020-11-17 08:36:38

by Neil Armstrong

Subject: Re: [PATCH] soc: amlogic: canvas: add missing put_device() call in meson_canvas_get()

On 17/11/2020 02:13, Yu Kuai wrote:
> if of_find_device_by_node() succeed, meson_canvas_get() doesn't have
> a corresponding put_device(). Thus add put_device() to fix the exception
> handling for this function implementation.
>
> Fixes: commit 382f8be04551 ("soc: amlogic: canvas: Fix meson_canvas_get when probe failed")
> Signed-off-by: Yu Kuai <[email protected]>
> ---
> drivers/soc/amlogic/meson-canvas.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson-canvas.c
> index c655f5f92b12..d0329ad170d1 100644
> --- a/drivers/soc/amlogic/meson-canvas.c
> +++ b/drivers/soc/amlogic/meson-canvas.c
> @@ -72,8 +72,10 @@ struct meson_canvas *meson_canvas_get(struct device *dev)
> * current state, this driver probe cannot return -EPROBE_DEFER
> */
> canvas = dev_get_drvdata(&canvas_pdev->dev);
> - if (!canvas)
> + if (!canvas) {
> + put_device(&canvas_pdev->dev);
> return ERR_PTR(-EINVAL);
> + }
>
> return canvas;
> }
>

Reviewed-by: Neil Armstrong <[email protected]>