diff options
| author | Douglas Anderson <dianders@chromium.org> | 2016-03-07 23:00:50 +0100 |
|---|---|---|
| committer | Mark Yao <mark.yao@rock-chips.com> | 2016-03-28 08:48:31 +0200 |
| commit | 948cf42700b15fc65ec4cc3ac52a8bbeb84b87ef (patch) | |
| tree | c65784b0eebe5cd03d764392db01c6b28fc9bc6c | |
| parent | drm/rockchip: vop: Disable planes when disabling CRTC (diff) | |
| download | linux-948cf42700b15fc65ec4cc3ac52a8bbeb84b87ef.tar.xz linux-948cf42700b15fc65ec4cc3ac52a8bbeb84b87ef.zip | |
drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path
The drm_encoder_cleanup() was missing both from the error path of
dw_hdmi_rockchip_bind(). This caused a crash when slub_debug was
enabled and we ended up deferring probe of HDMI at boot.
This call isn't needed from unbind() because if dw_hdmi_bind() returns
no error then it takes over the job of freeing the encoder (in
dw_hdmi_unbind).
Signed-off-by: Douglas Anderson <dianders@chromium.org>
| -rw-r--r-- | drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 3d3cf2f8891e..88776aba984e 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -293,7 +293,16 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs, DRM_MODE_ENCODER_TMDS, NULL); - return dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); + ret = dw_hdmi_bind(dev, master, data, encoder, iores, irq, plat_data); + + /* + * If dw_hdmi_bind() fails we'll never call dw_hdmi_unbind(), + * which would have called the encoder cleanup. Do it manually. + */ + if (ret) + drm_encoder_cleanup(encoder); + + return ret; } static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master, |