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

Commit ea7e3a66 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: fix DMM driver (un)registration 



At the moment the DMM driver is never unregistered, even if it's
registered in the omapdrm module's init function. This means we'll get
errors when reloading the omapdrm module.

Fix this by unregistering the DMM driver properly, and also change the
module init to fail if DMM driver cannot be registered, simplifying the
unregister path as we don't need to keep the state whether we registered
the DMM driver or not.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
parent 707cf58a

drivers/gpu/drm/omapdrm/omap_drv.c

+19 −4
Original line number Diff line number Diff line
@@ -727,18 +727,33 @@ static struct platform_driver pdev = { 


static int __init omap_drm_init(void)

{

	int r;



	DBG("init");

	if (platform_driver_register(&omap_dmm_driver)) {

		/* we can continue on without DMM.. so not fatal */

		dev_err(NULL, "DMM registration failed\n");



	r = platform_driver_register(&omap_dmm_driver);

	if (r) {

		pr_err("DMM driver registration failed\n");

		return r;

	}

	return platform_driver_register(&pdev);



	r = platform_driver_register(&pdev);

	if (r) {

		pr_err("omapdrm driver registration failed\n");

		platform_driver_unregister(&omap_dmm_driver);

		return r;

	}



	return 0;

}



static void __exit omap_drm_fini(void)

{

	DBG("fini");



	platform_driver_unregister(&pdev);



	platform_driver_unregister(&omap_dmm_driver);

}



/* need late_initcall() so we load after dss_driver's are loaded */