Commit-ID: 5ba9b0a14132d0b8d97affe909f324045a968d03
Gitweb: http://git.kernel.org/tip/5ba9b0a14132d0b8d97affe909f324045a968d03
Author: Hanjun Guo <[email protected]>
AuthorDate: Fri, 12 May 2017 11:55:26 +0800
Committer: Thomas Gleixner <[email protected]>
CommitDate: Fri, 12 May 2017 10:25:37 +0200
irqchip/mbigen: Fix memory mapping code
Some mbigens share memory regions, and devm_ioremap_resource
does not allow to share resources which will break the probe
of mbigen, in opposition to devm_ioremap.
This patch restores back usage of devm_ioremap function, but
with proper error handling and logging.
Fixes: 216646e4d82e ("irqchip/mbigen: Fix return value check in
mbigen_device_probe()")
Signed-off-by: Hanjun Guo <[email protected]>
Acked-by: Marc Zyngier <[email protected]>
Cc: Kefeng Wang <[email protected]>
Cc: [email protected]
Cc: Wei Yongjun <[email protected]>
Cc: MaJun <[email protected]>
Link:
http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
---
drivers/irqchip/irq-mbigen.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index d2306c8..0f5e66e 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -337,9 +337,12 @@ static int mbigen_device_probe(struct platform_device
*pdev)
mgn_chip->pdev = pdev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- mgn_chip->base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(mgn_chip->base))
- return PTR_ERR(mgn_chip->base);
+ mgn_chip->base = devm_ioremap(&pdev->dev, res->start,
+ resource_size(res));
+ if (!mgn_chip->base) {
+ dev_err(&pdev->dev, "failed to ioremap %pR\n", res);
+ return -ENOMEM;
+ }
if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node)
err = mbigen_of_create_domain(pdev, mgn_chip);
