From: Liguang Zhang <zhangliguang@linux.alibaba.com>
Date: Tue, 29 Jun 2021 11:27:48 +0000 (+0800)
Subject: ACPI: AMBA: Fix resource name in /proc/iomem
X-Git-Tag: v4.9.276~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3a68bfc2db8948eff05620062a6b70e30532931;p=thirdparty%2Fkernel%2Fstable.git

ACPI: AMBA: Fix resource name in /proc/iomem

[ Upstream commit 7718629432676b5ebd9a32940782fe297a0abf8d ]

In function amba_handler_attach(), dev->res.name is initialized by
amba_device_alloc. But when address_found is false, dev->res.name is
assigned to null value, which leads to wrong resource name display in
/proc/iomem, "<BAD>" is seen for those resources.

Signed-off-by: Liguang Zhang <zhangliguang@linux.alibaba.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c
index 7f77c071709a7..eb09ee71ceb2e 100644
--- a/drivers/acpi/acpi_amba.c
+++ b/drivers/acpi/acpi_amba.c
@@ -70,6 +70,7 @@ static int amba_handler_attach(struct acpi_device *adev,
 		case IORESOURCE_MEM:
 			if (!address_found) {
 				dev->res = *rentry->res;
+				dev->res.name = dev_name(&dev->dev);
 				address_found = true;
 			}
 			break;