From 384c73fdf437de8dc929a6c2485893e7ab1f3035 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Fri, 17 Jul 2009 17:54:14 +0200 Subject: [PATCH] --- yaml --- r: 165443 b: refs/heads/master c: 2763c508a3c8f8ec5d6df4e8c63d5e2a5a7d3954 h: refs/heads/master i: 165441: 5dcf2da537b9c5228ea69cf7acb1d663a8e880b6 165439: 1adebcaabf6f25313323d2c64f938a5fc4f21e14 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/physmap_of.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fee17d7cf613..0aed4db6f32d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44a1f2085e8fe07b3aecdab7c391ca057d75da0f +refs/heads/master: 2763c508a3c8f8ec5d6df4e8c63d5e2a5a7d3954 diff --git a/trunk/drivers/mtd/maps/physmap_of.c b/trunk/drivers/mtd/maps/physmap_of.c index 39d357b2eb47..f223f3fec3af 100644 --- a/trunk/drivers/mtd/maps/physmap_of.c +++ b/trunk/drivers/mtd/maps/physmap_of.c @@ -190,6 +190,7 @@ static int __devinit of_flash_probe(struct of_device *dev, const u32 *p; int reg_tuple_size; struct mtd_info **mtd_list = NULL; + resource_size_t res_size; reg_tuple_size = (of_n_addr_cells(dp) + of_n_size_cells(dp)) * sizeof(u32); @@ -233,8 +234,8 @@ static int __devinit of_flash_probe(struct of_device *dev, (unsigned long long)res.end); err = -EBUSY; - info->list[i].res = request_mem_region(res.start, res.end - - res.start + 1, + res_size = resource_size(&res); + info->list[i].res = request_mem_region(res.start, res_size, dev_name(&dev->dev)); if (!info->list[i].res) goto err_out; @@ -249,7 +250,7 @@ static int __devinit of_flash_probe(struct of_device *dev, info->list[i].map.name = dev_name(&dev->dev); info->list[i].map.phys = res.start; - info->list[i].map.size = res.end - res.start + 1; + info->list[i].map.size = res_size; info->list[i].map.bankwidth = *width; err = -ENOMEM;