From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Linux ACPI <linux-acpi@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [PATCH v2 5/5] ACPI: property: Adjust failure handling in acpi_nondev_subnode_extract()
Date: Mon, 15 Sep 2025 20:29:50 +0200 [thread overview]
Message-ID: <2322469.iZASKD2KPV@rafael.j.wysocki> (raw)
In-Reply-To: <5922318.DvuYhMxLoT@rafael.j.wysocki>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Make acpi_nondev_subnode_extract() follow the usual code flow pattern
in which failure is handled at the point where it is detected.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
v1 -> v2: Previously [4/4], no changes
---
drivers/acpi/property.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -123,20 +123,21 @@ static bool acpi_nondev_subnode_extract(
if (acpi_enumerate_nondev_subnodes(scope, desc, &dn->data, &dn->fwnode))
result = true;
- if (result) {
- /*
- * This will be NULL if the desc package is embedded in an outer
- * _DSD-equivalent package and its scope cannot be determined.
- */
- dn->handle = handle;
- dn->data.pointer = desc;
- list_add_tail(&dn->sibling, list);
- return true;
+ if (!result) {
+ kfree(dn);
+ acpi_handle_debug(handle, "Invalid properties/subnodes data, skipping\n");
+ return false;
}
- kfree(dn);
- acpi_handle_debug(handle, "Invalid properties/subnodes data, skipping\n");
- return false;
+ /*
+ * This will be NULL if the desc package is embedded in an outer
+ * _DSD-equivalent package and its scope cannot be determined.
+ */
+ dn->handle = handle;
+ dn->data.pointer = desc;
+ list_add_tail(&dn->sibling, list);
+
+ return true;
}
static bool acpi_nondev_subnode_ok(acpi_handle scope,
next prev parent reply other threads:[~2025-09-15 18:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-15 18:20 [PATCH v2 0/5] ACPI: property: Two fixes, more documentation and a cleanup Rafael J. Wysocki
2025-09-15 18:21 ` [PATCH v2 1/5] ACPI: property: Fix buffer properties extraction for subnodes Rafael J. Wysocki
2025-09-15 18:23 ` [PATCH v2 2/5] ACPI: property: Disregard references in data-only subnode lists Rafael J. Wysocki
2025-09-15 18:25 ` [PATCH v2 3/5] ACPI: property: Add code comments explaining what is going on Rafael J. Wysocki
2025-09-15 18:28 ` [PATCH v2 4/5] ACPI: property: Do not pass NULL handles to acpi_attach_data() Rafael J. Wysocki
2025-09-15 18:29 ` Rafael J. Wysocki [this message]
2025-09-16 14:09 ` [PATCH v2 0/5] ACPI: property: Two fixes, more documentation and a cleanup Sakari Ailus
2025-09-16 14:10 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2322469.iZASKD2KPV@rafael.j.wysocki \
--to=rafael@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox