diff options
| author | Jamie Iles <jamie@jamieiles.com> | 2011-01-11 12:43:42 +0000 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-01-19 16:22:01 -0500 |
| commit | 36adf2a0d181199d9e97021c92ccb4d9ee5b14fa (patch) | |
| tree | 4b4ee221bdb002cfb5210d5dca2795b05ae01fa7 | |
| parent | d2157e9be6a6231f2e97205536d0342c09a9bbfb (diff) | |
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>
(cherry picked from commit 0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea)
| -rw-r--r-- | drivers/video/s3c2410fb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index 46b430978bc..61c819e35f7 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; } |