lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: jz4740: 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.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Jamie Iles
2011-01-11 12:43:50 +00:00
committed by Chris Ball
parent 9047b435a0
commit 3119cbda85
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mmc/host/jz4740_mmc.c
View File

@@ -14,6 +14,7 @@
*/ */
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/err.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@@ -827,8 +828,8 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev)
} }
host->clk = clk_get(&pdev->dev, "mmc"); host->clk = clk_get(&pdev->dev, "mmc");
if (!host->clk) { if (IS_ERR(host->clk)) {
ret = -ENOENT; ret = PTR_ERR(host->clk);
dev_err(&pdev->dev, "Failed to get mmc clock\n"); dev_err(&pdev->dev, "Failed to get mmc clock\n");
goto err_free_host; goto err_free_host;
} }