Commit 3f77b439 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

misc: panel: Remove always-true check from panel_detach()

panel_detach() already verified that pptr is a valid pointer.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9db3cf1c
...@@ -2266,24 +2266,22 @@ static void panel_detach(struct parport *port) ...@@ -2266,24 +2266,22 @@ static void panel_detach(struct parport *port)
if (scan_timer.function) if (scan_timer.function)
del_timer_sync(&scan_timer); del_timer_sync(&scan_timer);
if (pprt) { if (keypad.enabled) {
if (keypad.enabled) { misc_deregister(&keypad_dev);
misc_deregister(&keypad_dev); keypad_initialized = 0;
keypad_initialized = 0; }
}
if (lcd.enabled) {
panel_lcd_print("\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-");
misc_deregister(&lcd_dev);
lcd.initialized = false;
}
/* TODO: free all input signals */ if (lcd.enabled) {
parport_release(pprt); panel_lcd_print("\x0cLCD driver unloaded.\x1b[Lc\x1b[Lb\x1b[L-");
parport_unregister_device(pprt); misc_deregister(&lcd_dev);
pprt = NULL; lcd.initialized = false;
unregister_reboot_notifier(&panel_notifier);
} }
/* TODO: free all input signals */
parport_release(pprt);
parport_unregister_device(pprt);
pprt = NULL;
unregister_reboot_notifier(&panel_notifier);
} }
static struct parport_driver panel_driver = { static struct parport_driver panel_driver = {
......
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