Skip to content

Commit

Permalink
s3c2410fb: don't treat NULL clk as an error
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jamie Iles authored and Paul Mundt committed Jan 12, 2011
1 parent ccd8c79 commit 0b2e9cb
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/video/s3c2410fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 0b2e9cb

Please sign in to comment.