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

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
...@@ -2377,23 +2377,17 @@ static int __init panel_init_module(void) ...@@ -2377,23 +2377,17 @@ static int __init panel_init_module(void)
/* tells various subsystems about the fact that we are initializing */ /* tells various subsystems about the fact that we are initializing */
init_in_progress = 1; 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) { if (!lcd.enabled && !keypad.enabled) {
/* no device enabled, let's release the parport */ /* no device enabled, let's exit */
if (pprt) {
parport_release(pprt);
parport_unregister_device(pprt);
pprt = NULL;
}
parport_unregister_driver(&panel_driver);
pr_err("driver version " PANEL_VERSION " disabled.\n"); pr_err("driver version " PANEL_VERSION " disabled.\n");
return -ENODEV; return -ENODEV;
} }
if (parport_register_driver(&panel_driver)) {
pr_err("could not register with parport. Aborting.\n");
return -EIO;
}
register_reboot_notifier(&panel_notifier); register_reboot_notifier(&panel_notifier);
if (pprt) if (pprt)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment