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

tty: serial: mpc5xxx: fix error handing in mpc52xx_uart_init()

Browse Source 
Add the missing uart_unregister_driver() and uninit before return
from mpc52xx_uart_init() in the error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Wei Yongjun 2013-04-25 15:34:27 +08:00 committed by Greg Kroah-Hartman
parent a82ea43965
commit 9bcc327844
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/serial/mpc52xx_uart.c
View File

@ -1497,18 +1497,23 @@ mpc52xx_uart_init(void)
if (psc_ops && psc_ops->fifoc_init) { if (psc_ops && psc_ops->fifoc_init) {
ret = psc_ops->fifoc_init(); ret = psc_ops->fifoc_init();
if (ret) if (ret)
return ret; goto err_init;
} }
ret = platform_driver_register(&mpc52xx_uart_of_driver); ret = platform_driver_register(&mpc52xx_uart_of_driver);
if (ret) { if (ret) {
printk(KERN_ERR "%s: platform_driver_register failed (%i)\n", printk(KERN_ERR "%s: platform_driver_register failed (%i)\n",
__FILE__, ret); __FILE__, ret);
uart_unregister_driver(&mpc52xx_uart_driver); goto err_reg;
return ret;
} }
return 0; return 0;
err_reg:
if (psc_ops && psc_ops->fifoc_uninit)
psc_ops->fifoc_uninit();
err_init:
uart_unregister_driver(&mpc52xx_uart_driver);
return ret;
} }
static void __exit static void __exit