Merge branch 'master' of /repos/git/net-next-2.6

[pandora-kernel.git] / drivers / video / nuc900fb.c

diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index 81687ed..62498bd 100644 (file)
--- a/drivers/video/nuc900fb.c
+++ b/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;
        }