From 9cf58a45d72bdc88a3f77d6cd4ea76817a3c6392 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 14 Feb 2019 15:52:24 +0100 Subject: ARM: davinci: cp-intc: request the memory region before remapping it Add a missing call to request_mem_region() before calling ioremap() to make sure it's not been requested by another user. Reviewed-by: David Lechner Signed-off-by: Bartosz Golaszewski Signed-off-by: Sekhar Nori --- arch/arm/mach-davinci/cp_intc.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'arch/arm/mach-davinci') diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index f56a4275083f..6ab56af3be6b 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -164,6 +164,15 @@ davinci_cp_intc_do_init(const struct davinci_cp_intc_config *config, { unsigned int num_regs = BITS_TO_LONGS(config->num_irqs); int offset, irq_base; + void __iomem *req; + + req = request_mem_region(config->reg.start, + resource_size(&config->reg), + "davinci-cp-intc"); + if (!req) { + pr_err("%s: register range busy\n", __func__); + return -EBUSY; + } davinci_cp_intc_base = ioremap(config->reg.start, resource_size(&config->reg)); -- cgit v1.2.3