Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: panel: fix error path

Browse Source 
panel_attach() poorly handles errors. On error unregister everything we
have registered.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Acked-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kulikov Vasiliy 2010-07-30 15:08:20 +04:00 committed by Greg Kroah-Hartman
parent d49d0e39a0
commit 10f3f5b7f6
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/panel/panel.c
View File

@ -2124,12 +2124,18 @@ static void panel_attach(struct parport *port)
NULL, NULL,
/*PARPORT_DEV_EXCL */ /*PARPORT_DEV_EXCL */
0, (void *)&pprt); 0, (void *)&pprt);
if (pprt == NULL) {
pr_err("panel_attach(): port->number=%d parport=%d, "
"parport_register_device() failed\n",
port->number, parport);
return;
}
if (parport_claim(pprt)) { if (parport_claim(pprt)) {
printk(KERN_ERR printk(KERN_ERR
"Panel: could not claim access to parport%d. " "Panel: could not claim access to parport%d. "
"Aborting.\n", parport); "Aborting.\n", parport);
return; goto err_unreg_device;
} }
/* must init LCD first, just in case an IRQ from the keypad is /* must init LCD first, just in case an IRQ from the keypad is
@ -2137,13 +2143,23 @@ static void panel_attach(struct parport *port)
*/ */
if (lcd_enabled) { if (lcd_enabled) {
lcd_init(); lcd_init();
misc_register(&lcd_dev); if (misc_register(&lcd_dev))
goto err_unreg_device;
} }
if (keypad_enabled) { if (keypad_enabled) {
keypad_init(); keypad_init();
misc_register(&keypad_dev); if (misc_register(&keypad_dev))
goto err_lcd_unreg;
} }
return;
err_lcd_unreg:
if (lcd_enabled)
misc_deregister(&lcd_dev);
err_unreg_device:
parport_unregister_device(pprt);
pprt = NULL;
} }
static void panel_detach(struct parport *port) static void panel_detach(struct parport *port)