diff options
| author | Jamie Iles <jamie@jamieiles.com> | 2011-01-11 12:43:50 +0000 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-01-25 21:53:51 -0500 |
| commit | 3119cbda858fc9ae10a69919e5f278abd6d93bb5 (patch) | |
| tree | 0ac3212b916871cb979e4bf4d454d95988b96b4b /drivers/mmc/host/jz4740_mmc.c | |
| parent | 9047b435a0b43952f5d1f7eb15a9b63a36efc7f2 (diff) | |
| download | kernel_goldelico_gta04-3119cbda858fc9ae10a69919e5f278abd6d93bb5.zip kernel_goldelico_gta04-3119cbda858fc9ae10a69919e5f278abd6d93bb5.tar.gz kernel_goldelico_gta04-3119cbda858fc9ae10a69919e5f278abd6d93bb5.tar.bz2 | |
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: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/jz4740_mmc.c')
| -rw-r--r-- | drivers/mmc/host/jz4740_mmc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index b3a0ab0..74218ad 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -14,6 +14,7 @@ */ #include <linux/mmc/host.h> +#include <linux/err.h> #include <linux/io.h> #include <linux/irq.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"); - if (!host->clk) { - ret = -ENOENT; + if (IS_ERR(host->clk)) { + ret = PTR_ERR(host->clk); dev_err(&pdev->dev, "Failed to get mmc clock\n"); goto err_free_host; } |