Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 146308
b: refs/heads/master
c: 9f322ad
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Glöckner authored and Linus Torvalds committed Jun 11, 2009
1 parent 237597f commit 849aa65
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e1463922a35584c863f71d4021e1e71f76eaed0
refs/heads/master: 9f322ad064f9210e7d472dfe77e702274d5c9dba
7 changes: 6 additions & 1 deletion trunk/drivers/serial/imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 849aa65

Please sign in to comment.