Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8c04514 authored by Jeffy Chen's avatar Jeffy Chen Committed by Heiko Stuebner
Browse files

drm/rockchip: analogix_dp: Add a sanity check for rockchip_drm_psr_register() 



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

Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
[moved psr_unregister reordering in unbind to separate patch]
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180110162348.22765-4-thierry.escande@collabora.com
parent 7fe201cd

drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

+10 −3
Original line number Diff line number Diff line
@@ -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,