summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nor/cfi_flash.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/nor/cfi_flash.c')
-rw-r--r--drivers/mtd/nor/cfi_flash.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mtd/nor/cfi_flash.c b/drivers/mtd/nor/cfi_flash.c
index feffbd04ac..e50f0e667f 100644
--- a/drivers/mtd/nor/cfi_flash.c
+++ b/drivers/mtd/nor/cfi_flash.c
@@ -966,13 +966,15 @@ static void cfi_init_mtd(struct flash_info *info)
static int cfi_probe_one(struct flash_info *info, int num)
{
+ struct resource *iores;
int ret;
info->flash_id = FLASH_UNKNOWN;
info->cmd_reset = FLASH_CMD_RESET;
- info->base = dev_request_mem_region(info->dev, num);
- if (IS_ERR(info->base))
- return PTR_ERR(info->base);
+ iores = dev_request_mem_resource(info->dev, num);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+ info->base = IOMEM(iores->start);
ret = flash_detect_size(info);
if (ret) {