redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Zach Reizner 2014-11-17 17:19:41 -08:00 committed by Dave Airlie
parent b0fcfc8995
commit a7ca52e108
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/cirrus/cirrus_main.c
View File

@ -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;
}