drm/cirrus: fix leaky driver load error handling

Before this patch, cirrus_device_init could have failed while
cirrus_mm_init succeeded and the driver would have reported overall
success on load. This patch causes cirrus_device_init to return on
the first error encountered.

Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c
index 99c1983f99d228b77ce9c498236ad68b348440e2..ab7cb547c570e7512b352a4fe1b81dbba63412fa 100644 (file)
--- a/drivers/gpu/drm/cirrus/cirrus_main.c
+++ b/drivers/gpu/drm/cirrus/cirrus_main.c
@@ -179,17 +179,22 @@ int cirrus_driver_load(struct drm_device *dev, unsigned long flags)
        }
 
        r = cirrus_mm_init(cdev);
-       if (r)
+       if (r) {
                dev_err(&dev->pdev->dev, "fatal err on mm init\n");
+               goto out;
+       }
 
        r = cirrus_modeset_init(cdev);
-       if (r)
+       if (r) {
                dev_err(&dev->pdev->dev, "Fatal error during modeset init: %d\n", r);
+               goto out;
+       }
 
        dev->mode_config.funcs = (void *)&cirrus_mode_funcs;
+
+       return 0;
 out:
-       if (r)
-               cirrus_driver_unload(dev);
+       cirrus_driver_unload(dev);
        return r;
 }