From 0b1f751bf8756d6828c511277cbdb35f3930f464 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Tue, 11 Jan 2011 12:43:43 +0000
Subject: [PATCH] --- yaml --- r: 230505 b: refs/heads/master c:
 ec03031707a348578c6ded277e5d92eb21de4fce h: refs/heads/master i:   230503:
 128fa9209eaa2e2198895b1dd630234b74a66b22 v: v3

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

diff --git a/[refs] b/[refs]
index 0b7b1d0ca4ac..5b4ef98b23c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea
+refs/heads/master: ec03031707a348578c6ded277e5d92eb21de4fce
diff --git a/trunk/drivers/video/nuc900fb.c b/trunk/drivers/video/nuc900fb.c
index 81687ed26ba9..62498bd662fc 100644
--- a/trunk/drivers/video/nuc900fb.c
+++ b/trunk/drivers/video/nuc900fb.c
@@ -15,6 +15,7 @@
  */
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
@@ -597,9 +598,9 @@ static int __devinit nuc900fb_probe(struct platform_device *pdev)
 	}
 
 	fbi->clk = clk_get(&pdev->dev, NULL);
-	if (!fbi->clk || IS_ERR(fbi->clk)) {
+	if (IS_ERR(fbi->clk)) {
 		printk(KERN_ERR "nuc900-lcd:failed to get lcd clock source\n");
-		ret = -ENOENT;
+		ret = PTR_ERR(fbi->clk);
 		goto release_irq;
 	}