summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-01-11 12:43:42 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-01-12 15:00:31 +0900
commit0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea (patch)
tree58ffc719ee3a68a429980f304466d3cb914c7116 /drivers/video
parentccd8c79c5608fc4835dcb0244623ceae2489f72d (diff)
downloadop-kernel-dev-0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea.zip
op-kernel-dev-0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea.tar.gz
s3c2410fb: 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: Vincent Sanders <support@simtec.co.uk> Cc: linux-fbdev@vger.kernel.org Signed-off-by: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/s3c2410fb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 46b4309..61c819e3 100644
--- 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;
}
OpenPOWER on IntegriCloud