Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186324
b: refs/heads/master
c: 49908e7
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Beregalov authored and Linus Torvalds committed Mar 6, 2010
1 parent 6cc4eb3 commit 2ceca3d
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: 27fb7f009bdb1ff13d4e4c008a2fd36b2305055b
refs/heads/master: 49908e739e23e2672d3efb9b1a35f877f8e86342
7 changes: 5 additions & 2 deletions trunk/drivers/rtc/rtc-mxc.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,11 @@ static int __init mxc_rtc_probe(struct platform_device *pdev)
pdata->ioaddr = ioremap(res->start, resource_size(res));

clk = clk_get(&pdev->dev, "ckil");
if (IS_ERR(clk))
return PTR_ERR(clk);
if (IS_ERR(clk)) {
iounmap(pdata->ioaddr);
ret = PTR_ERR(clk);
goto exit_free_pdata;
}

rate = clk_get_rate(clk);
clk_put(clk);
Expand Down

0 comments on commit 2ceca3d

Please sign in to comment.