Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7ca52e1 authored by Zach Reizner's avatar Zach Reizner Committed by Dave Airlie
Browse files

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: default avatarStéphane Marchesin <marcheu@chromium.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b0fcfc89

drivers/gpu/drm/cirrus/cirrus_main.c

+9 −4
Original line number Diff line number Diff line
@@ -179,16 +179,21 @@ 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);

	return r;

}