From a10d6c85ff3cd13abe684fbb3a6052c3c60dbe99 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Tue, 27 Dec 2011 15:01:31 +0100 Subject: [PATCH] --- yaml --- r: 282861 b: refs/heads/master c: bca7f5f71389547489fffe6c757eaff8659bcd16 h: refs/heads/master i: 282859: 9a99d724cda33d1afd2d46446bd24191f069d98d v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/txx9ndfmc.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a398af10568c..c36cd7e5c9b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af32b36095147e1828496b58987c1e24ef40487d +refs/heads/master: bca7f5f71389547489fffe6c757eaff8659bcd16 diff --git a/trunk/drivers/mtd/nand/txx9ndfmc.c b/trunk/drivers/mtd/nand/txx9ndfmc.c index ace46fdaef58..c7c4f1d11c77 100644 --- a/trunk/drivers/mtd/nand/txx9ndfmc.c +++ b/trunk/drivers/mtd/nand/txx9ndfmc.c @@ -298,11 +298,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev) drvdata = devm_kzalloc(&dev->dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; - if (!devm_request_mem_region(&dev->dev, res->start, - resource_size(res), dev_name(&dev->dev))) - return -EBUSY; - drvdata->base = devm_ioremap(&dev->dev, res->start, - resource_size(res)); + drvdata->base = devm_request_and_ioremap(&dev->dev, res); if (!drvdata->base) return -EBUSY;