Skip to content

Commit

Permalink
misc: panel: Remove always-true check from panel_detach()
Browse files Browse the repository at this point in the history
panel_detach() already verified that pptr is a valid pointer.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Geert Uytterhoeven authored and Greg Kroah-Hartman committed Feb 10, 2017
1 parent 9db3cf1 commit 3f77b43
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions drivers/misc/panel.c
Original file line number Diff line number Diff line change
Expand Up @@ -2266,24 +2266,22 @@ static void panel_detach(struct parport *port)
if (scan_timer.function)
del_timer_sync(&scan_timer);

if (pprt) {
if (keypad.enabled) {
misc_deregister(&keypad_dev);
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;
}
if (keypad.enabled) {
misc_deregister(&keypad_dev);
keypad_initialized = 0;
}

/* TODO: free all input signals */
parport_release(pprt);
parport_unregister_device(pprt);
pprt = NULL;
unregister_reboot_notifier(&panel_notifier);
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 */
parport_release(pprt);
parport_unregister_device(pprt);
pprt = NULL;
unregister_reboot_notifier(&panel_notifier);
}

static struct parport_driver panel_driver = {
Expand Down

0 comments on commit 3f77b43

Please sign in to comment.