leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nuc900fb: don't treat NULL clk as an error

Browse Source 
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>
This commit is contained in:
Jamie Iles 2011-01-11 12:43:43 +00:00 committed by Paul Mundt
parent 0b2e9cb42c
commit ec03031707
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/nuc900fb.c
View File

@ -15,6 +15,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/err.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/mm.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); 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"); printk(KERN_ERR "nuc900-lcd:failed to get lcd clock source\n");
ret = -ENOENT; ret = PTR_ERR(fbi->clk);
goto release_irq; goto release_irq;
} }