From 30c129b0ca298367ed13e6bb4dd9e2f65f34e9d5 Mon Sep 17 00:00:00 2001 From: Costantino Leandro Date: Tue, 17 Feb 2009 11:10:48 -0500 Subject: [PATCH] --- yaml --- r: 131898 b: refs/heads/master c: 5789813e73220a0bfd85a44bc565a6ae624e8745 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/panel/panel.c | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index c684cff1208e..8ab1ca3f9046 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 096c55d1de39c0de526dfeb8a68ba3b0200e5a93 +refs/heads/master: 5789813e73220a0bfd85a44bc565a6ae624e8745 diff --git a/trunk/drivers/staging/panel/panel.c b/trunk/drivers/staging/panel/panel.c index ab69c1bf36a8..c2747bc88c6f 100644 --- a/trunk/drivers/staging/panel/panel.c +++ b/trunk/drivers/staging/panel/panel.c @@ -2164,19 +2164,20 @@ static void __exit panel_cleanup_module(void) if (scan_timer.function != NULL) del_timer(&scan_timer); - if (keypad_enabled) - misc_deregister(&keypad_dev); + if (pprt != NULL) { + if (keypad_enabled) + misc_deregister(&keypad_dev); + + if (lcd_enabled) { + panel_lcd_print("\x0cLCD driver " PANEL_VERSION + "\nunloaded.\x1b[Lc\x1b[Lb\x1b[L-"); + misc_deregister(&lcd_dev); + } - if (lcd_enabled) { - panel_lcd_print("\x0cLCD driver " PANEL_VERSION - "\nunloaded.\x1b[Lc\x1b[Lb\x1b[L-"); - misc_deregister(&lcd_dev); + /* TODO: free all input signals */ + parport_release(pprt); + parport_unregister_device(pprt); } - - /* TODO: free all input signals */ - - parport_release(pprt); - parport_unregister_device(pprt); parport_unregister_driver(&panel_driver); }