diff options
| author | Zach Reizner <zachr@google.com> | 2014-11-17 17:19:41 -0800 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-20 11:41:26 +1000 |
| commit | a7ca52e108e549669940b11779bb491a931f8c65 (patch) | |
| tree | 290248f5e52ba80d17e82b0bf22103e79b041ea6 /drivers/gpu/drm/cirrus | |
| parent | b0fcfc899513a4d4729914b6872ab0564c0f523a (diff) | |
| download | op-kernel-dev-a7ca52e108e549669940b11779bb491a931f8c65.zip op-kernel-dev-a7ca52e108e549669940b11779bb491a931f8c65.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu/drm/cirrus')
| -rw-r--r-- | drivers/gpu/drm/cirrus/cirrus_main.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c index 99c1983..ab7cb54 100644 --- 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; } |
