diff options
| author | Jamie Iles <jamie@jamieiles.com> | 2011-01-11 12:43:49 +0000 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2011-03-11 14:22:41 +0000 |
| commit | 83025c824fce44b6d007b9bbc506c4189fb89da1 (patch) | |
| tree | 828825662a7c4aac2baa167615d7e29204494ab5 /drivers/mtd/nand | |
| parent | f53fdebcc3e1e5d15ffd0b1204d5944b4ceb8a07 (diff) | |
| download | kernel_samsung_aries-83025c824fce44b6d007b9bbc506c4189fb89da1.zip kernel_samsung_aries-83025c824fce44b6d007b9bbc506c4189fb89da1.tar.gz kernel_samsung_aries-83025c824fce44b6d007b9bbc506c4189fb89da1.tar.bz2 | |
mtd: mpc5121_nfc: 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>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/mpc5121_nfc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index 469e649..ddaf001 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c @@ -29,6 +29,7 @@ #include <linux/clk.h> #include <linux/gfp.h> #include <linux/delay.h> +#include <linux/err.h> #include <linux/init.h> #include <linux/interrupt.h> #include <linux/io.h> @@ -758,9 +759,9 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op, /* Enable NFC clock */ prv->clk = clk_get(dev, "nfc_clk"); - if (!prv->clk) { + if (IS_ERR(prv->clk)) { dev_err(dev, "Unable to acquire NFC clock!\n"); - retval = -ENODEV; + retval = PTR_ERR(prv->clk); goto error; } |