---

yaml --- r: 376063 b: refs/heads/master c: 9bcc327 h: refs/heads/master i: 376061: 0a9b1a7 376059: 5ef06d1 376055: f37c3e4 376047: c466122 376031: 4ab5311 375999: 904156b 375935: 15dea30 375807: a6edb5c v: v3
git-mirror · May 20, 2013 · d9a6e3b · d9a6e3b
1 parent 713e50d
commit d9a6e3b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a82ea439655a66d587f353a3992521159f4050ee
+refs/heads/master: 9bcc3278445bedc272dc2c432e81502d00ac9182
diff --git a/trunk/drivers/tty/serial/mpc52xx_uart.c b/trunk/drivers/tty/serial/mpc52xx_uart.c
@@ -1497,18 +1497,23 @@ mpc52xx_uart_init(void)
 	if (psc_ops && psc_ops->fifoc_init) {
 		ret = psc_ops->fifoc_init();
 		if (ret)
-			return ret;
+			goto err_init;
 	}
 
 	ret = platform_driver_register(&mpc52xx_uart_of_driver);
 	if (ret) {
 		printk(KERN_ERR "%s: platform_driver_register failed (%i)\n",
 		       __FILE__, ret);
-		uart_unregister_driver(&mpc52xx_uart_driver);
-		return ret;
+		goto err_reg;
 	}
 
 	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