Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310813
b: refs/heads/master
c: 149ff9e
h: refs/heads/master
i:
  310811: b9a80a2
v: v3
  • Loading branch information
Devendra Naga authored and Linus Walleij committed Jun 12, 2012
1 parent 01ae21b commit dfba67b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0bf7481852c8ece4888c299ba0259b789c3dbde3
refs/heads/master: 149ff9e1f240e7b57a02e0be5f74f21d0307d1d3
2 changes: 2 additions & 0 deletions trunk/drivers/pinctrl/pinctrl-mxs.c
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ int __devinit mxs_pinctrl_probe(struct platform_device *pdev,
return 0;

err:
platform_set_drvdata(pdev, NULL);
iounmap(d->base);
return ret;
}
Expand All @@ -525,6 +526,7 @@ int __devexit mxs_pinctrl_remove(struct platform_device *pdev)
{
struct mxs_pinctrl_data *d = platform_get_drvdata(pdev);

platform_set_drvdata(pdev, NULL);
pinctrl_unregister(d->pctl);
iounmap(d->base);

Expand Down

0 comments on commit dfba67b

Please sign in to comment.