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

[PATCH] applicom: fix error handling

Browse Source 
misc_register() can fail.

Signed-off-by: Christophe Lucas <clucas@rotomalug.org>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Christophe Lucas 2005-09-10 00:26:29 -07:00 committed by Linus Torvalds
parent 5ce7852cdf
commit 819a3eba42
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/char/applicom.c
View File

@ -172,7 +172,7 @@ static int ac_register_board(unsigned long physloc, void __iomem *loc,
void cleanup_module(void) void cleanup_module(void)
{ {
int i; unsigned int i;
misc_deregister(&ac_miscdev); misc_deregister(&ac_miscdev);
@ -195,7 +195,7 @@ int __init applicom_init(void)
int i, numisa = 0; int i, numisa = 0;
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
void __iomem *RamIO; void __iomem *RamIO;
int boardno; int boardno, ret;
printk(KERN_INFO "Applicom driver: $Id: ac.c,v 1.30 2000/03/22 16:03:57 dwmw2 Exp $\n"); printk(KERN_INFO "Applicom driver: $Id: ac.c,v 1.30 2000/03/22 16:03:57 dwmw2 Exp $\n");
@ -294,7 +294,8 @@ int __init applicom_init(void)
} }
if (!numisa) if (!numisa)
printk(KERN_WARNING"ac.o: No valid ISA Applicom boards found at mem 0x%lx\n",mem); printk(KERN_WARNING "ac.o: No valid ISA Applicom boards found "
"at mem 0x%lx\n", mem);
fin: fin:
init_waitqueue_head(&FlagSleepRec); init_waitqueue_head(&FlagSleepRec);
@ -304,7 +305,11 @@ int __init applicom_init(void)
DeviceErrorCount = 0; DeviceErrorCount = 0;
if (numboards) { if (numboards) {
misc_register(&ac_miscdev); ret = misc_register(&ac_miscdev);
if (ret) {
printk(KERN_WARNING "ac.o: Unable to register misc device\n");
goto out;
}
for (i = 0; i < MAX_BOARD; i++) { for (i = 0; i < MAX_BOARD; i++) {
int serial; int serial;
char boardname[(SERIAL_NUMBER - TYPE_CARD) + 1]; char boardname[(SERIAL_NUMBER - TYPE_CARD) + 1];
@ -337,6 +342,17 @@ int __init applicom_init(void)
else else
return -ENXIO; return -ENXIO;
out:
for (i = 0; i < MAX_BOARD; i++) {
if (!apbs[i].RamIO)
continue;
if (apbs[i].irq)
free_irq(apbs[i].irq, &dummy);
iounmap(apbs[i].RamIO);
}
pci_disable_device(dev);
return ret;
} }