Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 242749
b: refs/heads/master
c: 83025c8
h: refs/heads/master
i:
  242747: 1deb784
v: v3
  • Loading branch information
Jamie Iles authored and David Woodhouse committed Mar 11, 2011
1 parent fc03bd4 commit c6c4bff
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: f53fdebcc3e1e5d15ffd0b1204d5944b4ceb8a07
refs/heads/master: 83025c824fce44b6d007b9bbc506c4189fb89da1
5 changes: 3 additions & 2 deletions trunk/drivers/mtd/nand/mpc5121_nfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <linux/clk.h>
#include <linux/gfp.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/io.h>
Expand Down Expand Up @@ -758,9 +759,9 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op,

/* Enable NFC clock */
prv->clk = clk_get(dev, "nfc_clk");
if (!prv->clk) {
if (IS_ERR(prv->clk)) {
dev_err(dev, "Unable to acquire NFC clock!\n");
retval = -ENODEV;
retval = PTR_ERR(prv->clk);
goto error;
}

Expand Down

0 comments on commit c6c4bff

Please sign in to comment.