mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
mtd: nand: diskonchip: Request memory region prior ioremap()
This patch adds request_mem_region() prior ioremap() for diskonchip driver. This will allow to check if memory region is occupied by any other device, for example in case if we have memory region for several optional devices and only one device can be used at once. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
parent
3cb2c1ed4a
commit
4f0614a020
1 changed files with 9 additions and 1 deletions
|
@ -1440,10 +1440,13 @@ static int __init doc_probe(unsigned long physadr)
|
|||
int reg, len, numchips;
|
||||
int ret = 0;
|
||||
|
||||
if (!request_mem_region(physadr, DOC_IOREMAP_LEN, NULL))
|
||||
return -EBUSY;
|
||||
virtadr = ioremap(physadr, DOC_IOREMAP_LEN);
|
||||
if (!virtadr) {
|
||||
printk(KERN_ERR "Diskonchip ioremap failed: 0x%x bytes at 0x%lx\n", DOC_IOREMAP_LEN, physadr);
|
||||
return -EIO;
|
||||
ret = -EIO;
|
||||
goto error_ioremap;
|
||||
}
|
||||
|
||||
/* It's not possible to cleanly detect the DiskOnChip - the
|
||||
|
@ -1629,6 +1632,10 @@ static int __init doc_probe(unsigned long physadr)
|
|||
WriteDOC(save_control, virtadr, DOCControl);
|
||||
fail:
|
||||
iounmap(virtadr);
|
||||
|
||||
error_ioremap:
|
||||
release_mem_region(physadr, DOC_IOREMAP_LEN);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -1645,6 +1652,7 @@ static void release_nanddoc(void)
|
|||
nextmtd = doc->nextdoc;
|
||||
nand_release(mtd);
|
||||
iounmap(doc->virtadr);
|
||||
release_mem_region(doc->physadr, DOC_IOREMAP_LEN);
|
||||
kfree(mtd);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue