From 1199b845f22efc220fe9906ae665ad24d7995af1 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Thu, 31 Jan 2013 20:57:40 +0100
Subject: [PATCH] --- yaml --- r: 350970 b: refs/heads/master c:
 456de893ea1a693dc266c5464a6d857bfed0875f h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/acpi/scan.c | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a59ee75e4558..5a8bacbab65d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 141a297bd02e8ddc5ab625cc3a1a5926b1ff929a
+refs/heads/master: 456de893ea1a693dc266c5464a6d857bfed0875f
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index a849d2430dff..360f1338749b 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -871,29 +871,23 @@ EXPORT_SYMBOL(acpi_bus_unregister_driver);
    -------------------------------------------------------------------------- */
 static struct acpi_device *acpi_bus_get_parent(acpi_handle handle)
 {
+	struct acpi_device *device = NULL;
 	acpi_status status;
-	int ret;
-	struct acpi_device *device;
 
 	/*
 	 * Fixed hardware devices do not appear in the namespace and do not
 	 * have handles, but we fabricate acpi_devices for them, so we have
 	 * to deal with them specially.
 	 */
-	if (handle == NULL)
+	if (!handle)
 		return acpi_root;
 
 	do {
 		status = acpi_get_parent(handle, &handle);
-		if (status == AE_NULL_ENTRY)
-			return NULL;
 		if (ACPI_FAILURE(status))
-			return acpi_root;
-
-		ret = acpi_bus_get_device(handle, &device);
-		if (ret == 0)
-			return device;
-	} while (1);
+			return status == AE_NULL_ENTRY ? NULL : acpi_root;
+	} while (acpi_bus_get_device(handle, &device));
+	return device;
 }
 
 acpi_status