Commit 3119cbda authored by Jamie Iles's avatar Jamie Iles Committed by Chris Ball

mmc: jz4740: 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.
Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 9047b435
...@@ -14,6 +14,7 @@ ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment