From c3a8aceebb13cbc4d50bd8a3a781f4ec9ef14951 Mon Sep 17 00:00:00 2001 From: Justin Waters Date: Wed, 19 Sep 2012 14:11:53 -0400 Subject: fsl_nfc: Add default partitioning Allows the NAND to properly probe if cmdline partitioning is not specified. Otherwise, it will fail silently. --- drivers/mtd/nand/fsl_nfc.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/nand/fsl_nfc.c b/drivers/mtd/nand/fsl_nfc.c index 58f590d6f64e..f84c785e4383 100644 --- a/drivers/mtd/nand/fsl_nfc.c +++ b/drivers/mtd/nand/fsl_nfc.c @@ -934,20 +934,11 @@ fsl_nfc_probe(struct platform_device *pdev) /* Register device in MTD */ retval = parse_mtd_partitions(mtd, fsl_nfc_pprobes, &parts, 0); - if (retval < 0) { - printk(KERN_ERR DRV_NAME ": Error parsing MTD partitions!\n"); - free_irq(prv->irq, mtd); - retval = -EINVAL; - goto error; - } - - printk(KERN_DEBUG "parse partition: partnr = %d\n", retval); - - retval = mtd_device_register(mtd, parts, retval); - if (retval) { - printk(KERN_ERR DRV_NAME ": Error adding MTD device!\n"); - free_irq(prv->irq, mtd); - goto error; + if (retval > 0) + mtd_device_register(mtd, parts, retval); + else { + pr_info("Registering %s as whole device\n", mtd->name); + mtd_device_register(mtd, NULL, 0); } return 0; -- cgit v1.2.3