From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753815AbcCMAeE (ORCPT ); Sat, 12 Mar 2016 19:34:04 -0500 Received: from mga04.intel.com ([192.55.52.120]:63247 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753641AbcCMAdz (ORCPT ); Sat, 12 Mar 2016 19:33:55 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,327,1455004800"; d="scan'208";a="65134457" From: Irina Tirdea To: linux-acpi@vger.kernel.org, Len Brown , "Rafael J. Wysocki" Cc: Mika Westerberg , Andy Shevchenko , linux-kernel@vger.kernel.org, Octavian Purdila , Cristina Ciocan , Irina Tirdea Subject: [PATCH 1/1] ACPI / property: fix data node parsing in acpi_get_next_subnode Date: Sun, 13 Mar 2016 02:33:30 +0200 Message-Id: <1457829210-16892-1-git-send-email-irina.tirdea@intel.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Make sure that the acpi device that is parsed is the original acpi node and not any of its children. Signed-off-by: Irina Tirdea --- drivers/acpi/property.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index 2aee416..f2fd3fe 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -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); -- 1.9.1