Skip to content

Commit

Permalink
i.MX serial: fix init failure
Browse files Browse the repository at this point in the history
Adds extra "out" label to probe function after calling .init form platform data.
Because .init can return error number caused by gpio request fail.

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Darius Augulis authored and Sascha Hauer committed Sep 2, 2008
1 parent a9b0623 commit c45e7d7
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/serial/imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit c45e7d7

Please sign in to comment.