aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/mpc5121_nfc.c
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-01-11 07:43:49 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-03-11 09:22:41 -0500
commit83025c824fce44b6d007b9bbc506c4189fb89da1 (patch)
tree828825662a7c4aac2baa167615d7e29204494ab5 /drivers/mtd/nand/mpc5121_nfc.c
parentf53fdebcc3e1e5d15ffd0b1204d5944b4ceb8a07 (diff)
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/mpc5121_nfc.c')
-rw-r--r--drivers/mtd/nand/mpc5121_nfc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 469e649c911c..ddaf0011aa88 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -29,6 +29,7 @@
29#include <linux/clk.h> 29#include <linux/clk.h>
30#include <linux/gfp.h> 30#include <linux/gfp.h>
31#include <linux/delay.h> 31#include <linux/delay.h>
32#include <linux/err.h>
32#include <linux/init.h> 33#include <linux/init.h>
33#include <linux/interrupt.h> 34#include <linux/interrupt.h>
34#include <linux/io.h> 35#include <linux/io.h>
@@ -758,9 +759,9 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op,
758 759
759 /* Enable NFC clock */ 760 /* Enable NFC clock */
760 prv->clk = clk_get(dev, "nfc_clk"); 761 prv->clk = clk_get(dev, "nfc_clk");
761 if (!prv->clk) { 762 if (IS_ERR(prv->clk)) {
762 dev_err(dev, "Unable to acquire NFC clock!\n"); 763 dev_err(dev, "Unable to acquire NFC clock!\n");
763 retval = -ENODEV; 764 retval = PTR_ERR(prv->clk);
764 goto error; 765 goto error;
765 } 766 }
766 767