From 19655ef6bfae78cf2ca8a1484cea8c86633b09ba Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Tue, 11 Jan 2011 12:43:52 +0000
Subject: [PATCH] --- yaml --- r: 231270 b: refs/heads/master c:
 50c01fc355c6a97c511d58411f9bc0e4b8fc4659 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 82533e9380d1..bdcc19a9b1c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76d9cc454a8d0bb7484616a4b8136280068c8a8b
+refs/heads/master: 50c01fc355c6a97c511d58411f9bc0e4b8fc4659
diff --git a/trunk/drivers/spi/dw_spi_mmio.c b/trunk/drivers/spi/dw_spi_mmio.c
index db35bd9c1b24..2fa012c109bc 100644
--- a/trunk/drivers/spi/dw_spi_mmio.c
+++ b/trunk/drivers/spi/dw_spi_mmio.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/clk.h>
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -68,8 +69,8 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev)
 	}
 
 	dwsmmio->clk = clk_get(&pdev->dev, NULL);
-	if (!dwsmmio->clk) {
-		ret = -ENODEV;
+	if (IS_ERR(dwsmmio->clk)) {
+		ret = PTR_ERR(dwsmmio->clk);
 		goto err_irq;
 	}
 	clk_enable(dwsmmio->clk);