lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 246/717] soc: amlogic: canvas: add missing put_device() call in meson_canvas_get()
    Date
    From: Yu Kuai <yukuai3@huawei.com>

    [ Upstream commit 28f851e6afa858f182802e23ac60c3ed7d1c04a1 ]

    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: 382f8be04551 ("soc: amlogic: canvas: Fix meson_canvas_get when probe failed")
    Signed-off-by: Yu Kuai <yukuai3@huawei.com>
    Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
    Signed-off-by: Kevin Hilman <khilman@baylibre.com>
    Link: https://lore.kernel.org/r/20201117011322.522477-1-yukuai3@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 c655f5f92b124..d0329ad170d13 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.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:04    [W:4.146 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site