Depending on exact point of failure, not cleaning would lead to
BUG_ONs/oopses in various distant places.

Signed-off-by: Marcin Slusarz <[email protected]>
---
 drivers/gpu/drm/nouveau/nouveau_display.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c 
b/drivers/gpu/drm/nouveau/nouveau_display.c
index 5b4e354..71379f8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -325,14 +325,21 @@ nouveau_display_create(struct drm_device *dev)
 
        ret = disp->create(dev);
        if (ret)
-               return ret;
+               goto disp_create_err;
 
        if (dev->mode_config.num_crtc) {
                ret = drm_vblank_init(dev, dev->mode_config.num_crtc);
                if (ret)
-                       return ret;
+                       goto vblank_err;
        }
 
+       return 0;
+
+vblank_err:
+       disp->destroy(dev);
+disp_create_err:
+       drm_kms_helper_poll_fini(dev);
+       drm_mode_config_cleanup(dev);
        return ret;
 }
 
-- 
1.7.8.5

_______________________________________________
Nouveau mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau

Reply via email to