aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/txx9ndfmc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/nand/txx9ndfmc.c')
-rw-r--r--drivers/mtd/nand/txx9ndfmc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index e3d7266e256f..e1e8748aa47b 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -9,6 +9,7 @@
9 * (C) Copyright TOSHIBA CORPORATION 2004-2007 9 * (C) Copyright TOSHIBA CORPORATION 2004-2007
10 * All Rights Reserved. 10 * All Rights Reserved.
11 */ 11 */
12#include <linux/err.h>
12#include <linux/init.h> 13#include <linux/init.h>
13#include <linux/slab.h> 14#include <linux/slab.h>
14#include <linux/module.h> 15#include <linux/module.h>
@@ -286,9 +287,9 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
286 drvdata = devm_kzalloc(&dev->dev, sizeof(*drvdata), GFP_KERNEL); 287 drvdata = devm_kzalloc(&dev->dev, sizeof(*drvdata), GFP_KERNEL);
287 if (!drvdata) 288 if (!drvdata)
288 return -ENOMEM; 289 return -ENOMEM;
289 drvdata->base = devm_request_and_ioremap(&dev->dev, res); 290 drvdata->base = devm_ioremap_resource(&dev->dev, res);
290 if (!drvdata->base) 291 if (IS_ERR(drvdata->base))
291 return -EBUSY; 292 return PTR_ERR(drvdata->base);
292 293
293 hold = plat->hold ?: 20; /* tDH */ 294 hold = plat->hold ?: 20; /* tDH */
294 spw = plat->spw ?: 90; /* max(tREADID, tWP, tRP) */ 295 spw = plat->spw ?: 90; /* max(tREADID, tWP, tRP) */