Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364323
b: refs/heads/master
c: 4c24f2c
h: refs/heads/master
i:
  364321: 30de99e
  364319: b1d4079
v: v3
  • Loading branch information
Wolfram Sang authored and Greg Kroah-Hartman committed Apr 22, 2013
1 parent 96b39d7 commit a62dec0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 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: 4829e7650f8a40645e4e32b26a37fb833a5e75f0
refs/heads/master: 4c24f2c9b671a1dacf2e25a3b059b54bb8899de1
4 changes: 1 addition & 3 deletions trunk/drivers/tty/serial/mxs-auart.c
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ static int mxs_auart_probe(struct platform_device *pdev)
s->port.fifosize = 16;
s->port.uartclk = clk_get_rate(s->clk);
s->port.type = PORT_IMX;
s->port.dev = s->dev = get_device(&pdev->dev);
s->port.dev = s->dev = &pdev->dev;

s->ctrl = 0;

Expand Down Expand Up @@ -1134,7 +1134,6 @@ static int mxs_auart_probe(struct platform_device *pdev)
auart_port[pdev->id] = NULL;
free_irq(s->irq, s);
out_free_clk:
put_device(s->dev);
clk_put(s->clk);
out_free:
kfree(s);
Expand All @@ -1150,7 +1149,6 @@ static int mxs_auart_remove(struct platform_device *pdev)

auart_port[pdev->id] = NULL;

put_device(s->dev);
clk_put(s->clk);
free_irq(s->irq, s);
kfree(s);
Expand Down

0 comments on commit a62dec0

Please sign in to comment.