Commit 9bcc3278 authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman

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

Add the missing uart_unregister_driver() and uninit before return
from mpc52xx_uart_init() in the error handling case.
Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a82ea439
...@@ -1497,18 +1497,23 @@ mpc52xx_uart_init(void) ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment