Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1640188

[PATCH v2 1/3] irqchip/mbigen: Fix memory mapping code

Show all headers | View raw

From: Hanjun Guo <hanjun.guo@linaro.org>

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 <hanjun.guo@linaro.org>
---
 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);
-- 
1.7.12.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/3] irqchip/mbigen: bugfixs Hanjun Guo <guohanjun@huawei.com> - 2017-05-12 06:10 +0200
  [PATCH v2 2/3] irqchip/mbigen: Fix potential NULL dereferencing Hanjun Guo <guohanjun@huawei.com> - 2017-05-12 06:10 +0200
    [tip:irq/urgent] irqchip/mbigen: Fix potential NULL dereferencing tip-bot for Hanjun Guo <tipbot@zytor.com> - 2017-05-12 10:40 +0200
  [PATCH v2 3/3] irqchip/mbigen: Fix the clear register offset Hanjun Guo <guohanjun@huawei.com> - 2017-05-12 06:10 +0200
    [tip:irq/urgent] irqchip/mbigen: Fix the clear register offset  calculation tip-bot for MaJun <tipbot@zytor.com> - 2017-05-12 10:40 +0200
  [PATCH v2 1/3] irqchip/mbigen: Fix memory mapping code Hanjun Guo <guohanjun@huawei.com> - 2017-05-12 06:10 +0200
    [tip:irq/urgent] irqchip/mbigen: Fix memory mapping code tip-bot for Hanjun Guo <tipbot@zytor.com> - 2017-05-12 10:40 +0200
  Re: [PATCH v2 0/3] irqchip/mbigen: bugfixs "majun (Euler7)" <majun258@huawei.com> - 2017-05-12 09:00 +0200
  Re: [PATCH v2 0/3] irqchip/mbigen: bugfixs Marc Zyngier <marc.zyngier@arm.com> - 2017-05-12 10:00 +0200

csiph-web