From: Daniel Glöckner <dg@emlix.com>
Date: Thu, 11 Jun 2009 13:39:21 +0000 (+0100)
Subject: imx: serial: handle initialisation failure correctly
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9f322ad064f9210e7d472dfe77e702274d5c9dba;p=linux-beck.git

imx: serial: handle initialisation failure correctly

correctly de-initialise device when setting up failed,
call to pdata->exit() was missing.

Signed-off-by: Daniel Glöckner <dg@emlix.com>
Signed-off-by: Oskar Schirmer <os@emlix.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index e6c2ba26dcbb..cbd4f3224643 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1157,10 +1157,15 @@ static int serial_imx_probe(struct platform_device *pdev)
 			goto clkput;
 	}
 
-	uart_add_one_port(&imx_reg, &sport->port);
+	ret = uart_add_one_port(&imx_reg, &sport->port);
+	if (ret)
+		goto deinit;
 	platform_set_drvdata(pdev, &sport->port);
 
 	return 0;
+deinit:
+	if (pdata->exit)
+		pdata->exit(pdev);
 clkput:
 	clk_put(sport->clk);
 	clk_disable(sport->clk);