Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf4703fd authored by Irina Tirdea's avatar Irina Tirdea Committed by Rafael J. Wysocki
Browse files

ACPI / property: fix data node parsing in acpi_get_next_subnode() 



When an ACPI node has both ACPI device nodes and ACPI data nodes,
acpi_get_next_subnode() will return the ACPI data nodes of its last
parsed child.

To avoid that, make acpi_get_next_subnode() go back to the original
ACPI device object when all of the device node children of it have
been found already.

Signed-off-by: default avatarIrina Tirdea <irina.tirdea@intel.com>
[ rjw: Changelog ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 77812034

drivers/acpi/property.c

+1 −0
Original line number Diff line number Diff line
@@ -816,6 +816,7 @@ struct fwnode_handle *acpi_get_next_subnode(struct device *dev, 
			next = adev->node.next;

			if (next == head) {

				child = NULL;

				adev = ACPI_COMPANION(dev);

				goto nondev;

			}

			adev = list_entry(next, struct acpi_device, node);