summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLiguang Zhang <zhangliguang@linux.alibaba.com>2021-06-29 19:27:48 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-20 16:05:49 +0200
commit4f2b140658cd97e1f17e9e8a7ffbe2675184dfe6 (patch)
treed77979fe2c6c84cd481b1b57537e9001c333d7d7 /drivers/acpi
parent9dcc9ad3434869d7413a0220821181b3de1cd396 (diff)
downloadlinux-stable-4f2b140658cd97e1f17e9e8a7ffbe2675184dfe6.tar.gz
linux-stable-4f2b140658cd97e1f17e9e8a7ffbe2675184dfe6.tar.bz2
linux-stable-4f2b140658cd97e1f17e9e8a7ffbe2675184dfe6.zip
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpi_amba.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c
index 49b781a9cd97..ab8a4e0191b1 100644
--- a/drivers/acpi/acpi_amba.c
+++ b/drivers/acpi/acpi_amba.c
@@ -76,6 +76,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;