Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 232491
b: refs/heads/master
c: 3119cbd
h: refs/heads/master
i:
  232489: 201513a
  232487: 063c9d8
v: v3
  • Loading branch information
Jamie Iles authored and Chris Ball committed Jan 26, 2011
1 parent 9f6c61e commit 67fe37f
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 9047b435a0b43952f5d1f7eb15a9b63a36efc7f2
refs/heads/master: 3119cbda858fc9ae10a69919e5f278abd6d93bb5
5 changes: 3 additions & 2 deletions trunk/drivers/mmc/host/jz4740_mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/

#include <linux/mmc/host.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
Expand Down Expand Up @@ -827,8 +828,8 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev)
}

host->clk = clk_get(&pdev->dev, "mmc");
if (!host->clk) {
ret = -ENOENT;
if (IS_ERR(host->clk)) {
ret = PTR_ERR(host->clk);
dev_err(&pdev->dev, "Failed to get mmc clock\n");
goto err_free_host;
}
Expand Down

0 comments on commit 67fe37f

Please sign in to comment.