Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / video / s3c2410fb.c

diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 46b430978bcc9fc4fab55597711aef5072d94504..61c819e35f7f42b978838ff9c60dde28aade586a 100644 (file)
--- a/drivers/video/s3c2410fb.c
+++ b/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;
        }