summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHubert Feurstein <h.feurstein@gmail.com>2011-09-09 13:46:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-09-12 12:25:05 +0200
commit8cc995ed42c7277ce1210bcfa42b60f4f8c6b9e0 (patch)
tree323501c61f543555c39c0d211f0b7e61a351f951 /drivers
parent51a4275c71c6b9a3f0fd4bb55e3463d9205efe2b (diff)
downloadbarebox-8cc995ed42c7277ce1210bcfa42b60f4f8c6b9e0.tar.gz
barebox-8cc995ed42c7277ce1210bcfa42b60f4f8c6b9e0.tar.xz
atmel_mci: handle clk_get error correctly
Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mci/atmel_mci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c
index 71aec16fa2..7af153aa2f 100644
--- a/drivers/mci/atmel_mci.c
+++ b/drivers/mci/atmel_mci.c
@@ -23,6 +23,7 @@
#include <asm/io.h>
#include <mach/board.h>
#include <linux/clk.h>
+#include <linux/err.h>
#include "at91_mci.h"
@@ -461,9 +462,9 @@ static int mci_probe(struct device_d *hw_dev)
host->hw_dev = hw_dev;
hw_dev->priv = host;
host->clk = clk_get(hw_dev, "mci_clk");
- if (host->clk == NULL) {
+ if (IS_ERR(host->clk)) {
dev_err(hw_dev, "no mci_clk\n");
- return -EINVAL;
+ return PTR_ERR(host->clk);
}
clk_rate = clk_get_rate(host->clk);