---

yaml --- r: 109832 b: refs/heads/master c: c45e7d7 h: refs/heads/master v: v3
git-mirror · Sep 2, 2008 · ebbe27c · ebbe27c
1 parent 17baace
commit ebbe27c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9b0623357d2faa49a0f862154ba36c42c4bad2b
+refs/heads/master: c45e7d7be891fe94e13d0e7aeee3e0e4ee7118f4
diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c
@@ -1133,13 +1133,19 @@ static int serial_imx_probe(struct platform_device *pdev)
 	if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS))
 		sport->have_rtscts = 1;
 
-	if (pdata->init)
-		pdata->init(pdev);
+	if (pdata->init) {
+		ret = pdata->init(pdev);
+		if (ret)
+			goto clkput;
+	}
 
 	uart_add_one_port(&imx_reg, &sport->port);
 	platform_set_drvdata(pdev, &sport->port);
 
 	return 0;
+clkput:
+	clk_put(sport->clk);
+	clk_disable(sport->clk);
 unmap:
 	iounmap(sport->port.membase);
 free: