lkml.org 
[lkml]   [2019]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.1 002/186] media: rockchip/vpu: Add missing dont_use_autosuspend() calls
    Date
    From: Jonas Karlman <jonas@kwiboo.se>

    [ Upstream commit 5c5b90f5cbad77dc15d8b5582efdb2e362bcd710 ]

    Those calls are needed to restore a clean PM state when the probe fails
    or when the driver is unloaded such that future ->probe() calls can
    initialize runtime PM again.

    Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
    Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
    index 33b556b3f0df8..d489b5dd54d7a 100644
    --- a/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
    +++ b/drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
    @@ -492,6 +492,7 @@ static int rockchip_vpu_probe(struct platform_device *pdev)
    v4l2_device_unregister(&vpu->v4l2_dev);
    err_clk_unprepare:
    clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
    + pm_runtime_dont_use_autosuspend(vpu->dev);
    pm_runtime_disable(vpu->dev);
    return ret;
    }
    @@ -512,6 +513,7 @@ static int rockchip_vpu_remove(struct platform_device *pdev)
    v4l2_m2m_release(vpu->m2m_dev);
    v4l2_device_unregister(&vpu->v4l2_dev);
    clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);
    + pm_runtime_dont_use_autosuspend(vpu->dev);
    pm_runtime_disable(vpu->dev);
    return 0;
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-06-01 15:45    [W:4.035 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site