summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-01-11 12:43:43 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-01-12 15:00:32 +0900
commitec03031707a348578c6ded277e5d92eb21de4fce (patch)
tree4adf97316956eb4b48235c12f7dbaebd76ea97e3 /drivers/video
parent0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea (diff)
downloadop-kernel-dev-ec03031707a348578c6ded277e5d92eb21de4fce.zip
op-kernel-dev-ec03031707a348578c6ded277e5d92eb21de4fce.tar.gz
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: 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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/nuc900fb.c5
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;
}
OpenPOWER on IntegriCloud