Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 348472
b: refs/heads/master
c: ba607b6
h: refs/heads/master
v: v3
  • Loading branch information
Sebastian Hesselbarth authored and Jason Cooper committed Jan 7, 2013
1 parent b4538c3 commit 1ef2426
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 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: db7d77e6a7a60dbbac34fe59bc38bc8e7e5e1380
refs/heads/master: ba607b6238a1f418c45b9d7f73212bcc6922da53
7 changes: 5 additions & 2 deletions trunk/drivers/pinctrl/mvebu/pinctrl-dove.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,8 +595,11 @@ static int __devinit dove_pinctrl_probe(struct platform_device *pdev)
* grab clk to make sure it is ticking.
*/
clk = devm_clk_get(&pdev->dev, NULL);
if (!IS_ERR(clk))
clk_prepare_enable(clk);
if (IS_ERR(clk)) {
dev_err(&pdev->dev, "Unable to get pdma clock");
return PTR_RET(clk);
}
clk_prepare_enable(clk);

return mvebu_pinctrl_probe(pdev);
}
Expand Down

0 comments on commit 1ef2426

Please sign in to comment.