From c6c4bff4bffa1773e803580fadc836d4f007e0a2 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Tue, 11 Jan 2011 12:43:49 +0000
Subject: [PATCH] --- yaml --- r: 242749 b: refs/heads/master c:
 83025c824fce44b6d007b9bbc506c4189fb89da1 h: refs/heads/master i:   242747:
 1deb784901d5fa11c9cf453d0d5be1737c3c06fe v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/mtd/nand/mpc5121_nfc.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dd38f4cbb431..6d57ba7dc83e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f53fdebcc3e1e5d15ffd0b1204d5944b4ceb8a07
+refs/heads/master: 83025c824fce44b6d007b9bbc506c4189fb89da1
diff --git a/trunk/drivers/mtd/nand/mpc5121_nfc.c b/trunk/drivers/mtd/nand/mpc5121_nfc.c
index 469e649c911c..ddaf0011aa88 100644
--- a/trunk/drivers/mtd/nand/mpc5121_nfc.c
+++ b/trunk/drivers/mtd/nand/mpc5121_nfc.c
@@ -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>
@@ -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;
 	}