From 882bed7298f14cc04a94934b4efa801b1c7873e0 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 14 Feb 2019 15:52:13 +0100 Subject: ARM: davinci: aintc: request memory region before remapping it Add a missing call to request_mem_region() before calling ioremap() to make sure the region is not being used by anyone else. Reviewed-by: David Lechner Signed-off-by: Bartosz Golaszewski Signed-off-by: Sekhar Nori --- arch/arm/mach-davinci/irq.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'arch/arm/mach-davinci') diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 2afaf19dc46c..2b6943731af9 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -86,9 +86,18 @@ davinci_aintc_handle_irq(struct pt_regs *regs) void __init davinci_aintc_init(const struct davinci_aintc_config *config) { unsigned int irq_off, reg_off, prio, shift; + void __iomem *req; int ret, irq_base; const u8 *prios; + 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; + } + davinci_aintc_base = ioremap(config->reg.start, resource_size(&config->reg)); if (!davinci_aintc_base) { -- cgit v1.2.3