From 55033a796bf3cb0e83e7cc822b792bab33a1cb62 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Tue, 11 Jan 2011 12:43:42 +0000
Subject: [PATCH] --- yaml --- r: 230504 b: refs/heads/master c:
 0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cd716e44856e..0b7b1d0ca4ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccd8c79c5608fc4835dcb0244623ceae2489f72d
+refs/heads/master: 0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea
diff --git a/trunk/drivers/video/s3c2410fb.c b/trunk/drivers/video/s3c2410fb.c
index 46b430978bcc..61c819e35f7f 100644
--- a/trunk/drivers/video/s3c2410fb.c
+++ b/trunk/drivers/video/s3c2410fb.c
@@ -13,6 +13,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>
@@ -918,9 +919,9 @@ static int __devinit s3c24xxfb_probe(struct platform_device *pdev,
 	}
 
 	info->clk = clk_get(NULL, "lcd");
-	if (!info->clk || IS_ERR(info->clk)) {
+	if (IS_ERR(info->clk)) {
 		printk(KERN_ERR "failed to get lcd clock source\n");
-		ret = -ENOENT;
+		ret = PTR_ERR(info->clk);
 		goto release_irq;
 	}