nuc900fb: don't treat NULL clk as an error
authorJamie Iles <jamie@jamieiles.com>
Tue, 11 Jan 2011 12:43:43 +0000 (12:43 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 12 Jan 2011 06:00:32 +0000 (15:00 +0900)
clk_get() returns a struct clk cookie to the driver and some platforms
may return NULL if they only support a single clock.  clk_get() has only
failed if it returns a ERR_PTR() encoded pointer.

Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/video/nuc900fb.c

index 81687ed..62498bd 100644 (file)
@@ -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;
        }