From 67fe37f08c7d6955b34695e86a8d6852d7089022 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Tue, 11 Jan 2011 12:43:50 +0000
Subject: [PATCH] --- yaml --- r: 232491 b: refs/heads/master c:
 3119cbda858fc9ae10a69919e5f278abd6d93bb5 h: refs/heads/master i:   232489:
 201513a34588346ac5588aa7f6e115ef3985b3dd   232487:
 063c9d8f1a8b223e365311ac51fd86862077a824 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/mmc/host/jz4740_mmc.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b86537991629..327b94a2e702 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9047b435a0b43952f5d1f7eb15a9b63a36efc7f2
+refs/heads/master: 3119cbda858fc9ae10a69919e5f278abd6d93bb5
diff --git a/trunk/drivers/mmc/host/jz4740_mmc.c b/trunk/drivers/mmc/host/jz4740_mmc.c
index b3a0ab0e4c2b..74218ad677e4 100644
--- a/trunk/drivers/mmc/host/jz4740_mmc.c
+++ b/trunk/drivers/mmc/host/jz4740_mmc.c
@@ -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>
@@ -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;
 	}