lkml.org 
[lkml]   [2018]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 3/8] drm/rockchip: analogix_dp: Add a sanity check for rockchip_drm_psr_register()
    Date
    From: Jeffy Chen <jeffy.chen@rock-chips.com>

    The rockchip_drm_psr_register() can fail, so add a sanity check for that.

    Also reorder the calls in unbind() to match bind().

    Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
    Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
    ---
    drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 15 +++++++++++----
    1 file changed, 11 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    index 37250ab63bd7..eb88c52336a7 100644
    --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    @@ -354,15 +354,22 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
    dp->psr_state = ~EDP_VSC_PSR_STATE_ACTIVE;
    INIT_WORK(&dp->psr_work, analogix_dp_psr_work);

    - rockchip_drm_psr_register(&dp->encoder, analogix_dp_psr_set);
    + ret = rockchip_drm_psr_register(&dp->encoder, analogix_dp_psr_set);
    + if (ret < 0)
    + goto err_cleanup_encoder;

    dp->adp = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data);
    if (IS_ERR(dp->adp)) {
    - dp->encoder.funcs->destroy(&dp->encoder);
    - return PTR_ERR(dp->adp);
    + ret = PTR_ERR(dp->adp);
    + goto err_unreg_psr;
    }

    return 0;
    +err_unreg_psr:
    + rockchip_drm_psr_unregister(&dp->encoder);
    +err_cleanup_encoder:
    + dp->encoder.funcs->destroy(&dp->encoder);
    + return ret;
    }

    static void rockchip_dp_unbind(struct device *dev, struct device *master,
    @@ -370,8 +377,8 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master,
    {
    struct rockchip_dp_device *dp = dev_get_drvdata(dev);

    - rockchip_drm_psr_unregister(&dp->encoder);
    analogix_dp_unbind(dp->adp);
    + rockchip_drm_psr_unregister(&dp->encoder);
    dp->encoder.funcs->destroy(&dp->encoder);
    }

    --
    2.14.1
    \
     
     \ /
      Last update: 2018-01-14 23:21    [W:2.722 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site