diff options
author | Jamie Iles <jamie@jamieiles.com> | 2011-01-11 07:43:42 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 01:00:31 -0500 |
commit | 0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea (patch) | |
tree | 58ffc719ee3a68a429980f304466d3cb914c7116 /drivers/video/s3c2410fb.c | |
parent | ccd8c79c5608fc4835dcb0244623ceae2489f72d (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>
Diffstat (limited to 'drivers/video/s3c2410fb.c')
-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 46b430978bcc..61c819e35f7f 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -13,6 +13,7 @@ | |||
13 | 13 | ||
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <linux/err.h> | ||
16 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
17 | #include <linux/string.h> | 18 | #include <linux/string.h> |
18 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
@@ -918,9 +919,9 @@ static int __devinit s3c24xxfb_probe(struct platform_device *pdev, | |||
918 | } | 919 | } |
919 | 920 | ||
920 | info->clk = clk_get(NULL, "lcd"); | 921 | info->clk = clk_get(NULL, "lcd"); |
921 | if (!info->clk || IS_ERR(info->clk)) { | 922 | if (IS_ERR(info->clk)) { |
922 | printk(KERN_ERR "failed to get lcd clock source\n"); | 923 | printk(KERN_ERR "failed to get lcd clock source\n"); |
923 | ret = -ENOENT; | 924 | ret = PTR_ERR(info->clk); |
924 | goto release_irq; | 925 | goto release_irq; |
925 | } | 926 | } |
926 | 927 | ||