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

Commit f43de77c authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

staging: panel: register driver after checking device 



register the driver only if lcd or keypad has been enabled and if
both are disabled then just exit.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ab81fb7

drivers/staging/panel/panel.c

+6 −12
Original line number Diff line number Diff line
@@ -2377,23 +2377,17 @@ static int __init panel_init_module(void) 
	/* tells various subsystems about the fact that we are initializing */

	init_in_progress = 1;



	if (parport_register_driver(&panel_driver)) {

		pr_err("could not register with parport. Aborting.\n");

		return -EIO;

	}



	if (!lcd.enabled && !keypad.enabled) {

		/* no device enabled, let's release the parport */

		if (pprt) {

			parport_release(pprt);

			parport_unregister_device(pprt);

			pprt = NULL;

		}

		parport_unregister_driver(&panel_driver);

		/* no device enabled, let's exit */

		pr_err("driver version " PANEL_VERSION " disabled.\n");

		return -ENODEV;

	}



	if (parport_register_driver(&panel_driver)) {

		pr_err("could not register with parport. Aborting.\n");

		return -EIO;

	}



	register_reboot_notifier(&panel_notifier);



	if (pprt)