aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Gaignard <benjamin.gaignard@linaro.org>2014-12-11 07:35:29 -0500
committerBenjamin Gaignard <benjamin.gaignard@linaro.org>2014-12-11 08:00:19 -0500
commitf78e772a2c7aa4e96398de9e3fa0be750c705d3a (patch)
tree4164e82ef4e7bc87f21f1b61559de55a47640d68
parent4fdbc678fe4dc18cbf1d97e1b45660f91c3089b4 (diff)
drm: sti: correctly cleanup CRTC and planes
When bind failed make sure that CRTC and planes are completely clean up to avoid properties duplication. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
-rw-r--r--drivers/gpu/drm/sti/sti_drm_drv.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sti/sti_drm_drv.c b/drivers/gpu/drm/sti/sti_drm_drv.c
index 223d93c3a05d..9ce7574ac873 100644
--- a/drivers/gpu/drm/sti/sti_drm_drv.c
+++ b/drivers/gpu/drm/sti/sti_drm_drv.c
@@ -67,8 +67,12 @@ static int sti_drm_load(struct drm_device *dev, unsigned long flags)
67 sti_drm_mode_config_init(dev); 67 sti_drm_mode_config_init(dev);
68 68
69 ret = component_bind_all(dev->dev, dev); 69 ret = component_bind_all(dev->dev, dev);
70 if (ret) 70 if (ret) {
71 drm_kms_helper_poll_fini(dev);
72 drm_mode_config_cleanup(dev);
73 kfree(private);
71 return ret; 74 return ret;
75 }
72 76
73 drm_helper_disable_unused_functions(dev); 77 drm_helper_disable_unused_functions(dev);
74 78