summaryrefslogtreecommitdiff
path: root/drivers/staging/panel
diff options
context:
space:
mode:
authorPeter Huewe <peterhuewe@gmx.de>2010-07-07 04:52:16 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-08 13:57:58 -0700
commit060132ae42cce3f9d2fd34d9a17b98362b44b9f9 (patch)
treecfbae01297ce2fa8324f590aca4ff5eb9a951da6 /drivers/staging/panel
parentfeffce47678375a6422d5356a379e407f007d424 (diff)
Staging: panel: Prevent double-calling of parport_release - fix oops.
This patch prevents the code from calling parport_release and parport_unregister_device twice with the same arguments - and thus fixes an oops. Rationale: After the first call the parport is already released and the handle isn't valid anymore and calling parport_release and parport_unregister_device twice isn't a good idea. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Cc: stable <stable@kernel.org> Acked-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'drivers/staging/panel')
-rw-r--r--drivers/staging/panel/panel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 3154ffe59277..6fa57beeccb5 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -2277,6 +2277,7 @@ int panel_init(void)
if (pprt) {
parport_release(pprt);
parport_unregister_device(pprt);
+ pprt = NULL;
}
parport_unregister_driver(&panel_driver);
printk(KERN_ERR "Panel driver version " PANEL_VERSION
@@ -2327,6 +2328,7 @@ static void __exit panel_cleanup_module(void)
/* TODO: free all input signals */
parport_release(pprt);
parport_unregister_device(pprt);
+ pprt = NULL;
}
parport_unregister_driver(&panel_driver);
}