openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ioc3/ioc4: fix error path on driver registration 

Two IOC3 and IOC4 drivers have broken error paths on registration.  Fix
them.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Pat Gefre <pfg@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jean Delvare 2009-12-14 18:00:28 -08:00 committed by Linus Torvalds
parent 2ea5d35a49
commit 9385565e20
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/serial/ioc4_serial.c
View File

@ -2913,17 +2913,27 @@ static int __init ioc4_serial_init(void)
printk(KERN_WARNING printk(KERN_WARNING
"%s: Couldn't register rs232 IOC4 serial driver\n", "%s: Couldn't register rs232 IOC4 serial driver\n",
__func__); __func__);
return ret; goto out;
} }
if ((ret = uart_register_driver(&ioc4_uart_rs422)) < 0) { if ((ret = uart_register_driver(&ioc4_uart_rs422)) < 0) {
printk(KERN_WARNING printk(KERN_WARNING
"%s: Couldn't register rs422 IOC4 serial driver\n", "%s: Couldn't register rs422 IOC4 serial driver\n",
__func__); __func__);
return ret; goto out_uart_rs232;
} }
/* register with IOC4 main module */ /* register with IOC4 main module */
return ioc4_register_submodule(&ioc4_serial_submodule); ret = ioc4_register_submodule(&ioc4_serial_submodule);
if (ret)
goto out_uart_rs422;
return 0;
out_uart_rs422:
uart_unregister_driver(&ioc4_uart_rs422);
out_uart_rs232:
uart_unregister_driver(&ioc4_uart_rs232);
out:
return ret;
} }
static void __exit ioc4_serial_exit(void) static void __exit ioc4_serial_exit(void)

2
drivers/sn/ioc3.c
View File

@ -820,7 +820,7 @@ static int __init ioc3_init(void)
{ {
if (ia64_platform_is("sn2")) if (ia64_platform_is("sn2"))
return pci_register_driver(&ioc3_driver); return pci_register_driver(&ioc3_driver);
return 0; return -ENODEV;
} }
/* Module unload */ /* Module unload */