[PATCH 06/16] nuc900fb: don't treat NULL clk as an error

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: Wan ZongShun <redacted>
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Jamie Iles <redacted>
---
 drivers/video/nuc900fb.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

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

-- 
1.7.3.4

2011/1/11 Jamie Iles [off-list ref]:

Hi,

Thanks for your patch.

Acked-by: Wan ZongShun <redacted>

--
1.7.3.4

-- 
*linux-arm-kernel mailing list
mail addr:linux-arm-kernel@lists.infradead.org
you can subscribe by:
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

* linux-arm-NUC900 mailing list
mail addr:NUC900@googlegroups.com
main web: https://groups.google.com/group/NUC900
you can subscribe it by sending me mail:
mcuos.com@gmail.com

On Wed, Jan 12, 2011 at 09:24:47AM +0800, Wan ZongShun wrote:

2011/1/11 Jamie Iles [off-list ref]:

quoted

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: Wan ZongShun <redacted>
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Jamie Iles <redacted>

Thanks for your patch.

Acked-by: Wan ZongShun <redacted>

Applied, thanks.