summaryrefslogtreecommitdiff
path: root/drivers
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:16:12 +0200
commit6a8a25196a818096f02c187233812c312359c1c9 (patch)
tree2aedfd11d85bfd928e0c4de2ce43fbb491c570a1 /drivers
parent8c55de0f1995f194eed1ee36c0a6d87c12f97d34 (diff)
downloadlinux-6a8a25196a818096f02c187233812c312359c1c9.tar.gz
linux-6a8a25196a818096f02c187233812c312359c1c9.tar.bz2
linux-6a8a25196a818096f02c187233812c312359c1c9.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')
-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 7f77c071709a..eb09ee71ceb2 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;