---

yaml --- r: 350852 b: refs/heads/master c: 0613e1f h: refs/heads/master v: v3
git-mirror · Jan 31, 2013 · 79a04c2 · 79a04c2
1 parent 73c0500
commit 79a04c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c511cc1990bbc263c3f8a2ef4d7d613a3b40ffe2
+refs/heads/master: 0613e1f7fd98a0cef2a7add1368a87cdd86a1106
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
@@ -444,9 +444,9 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
 					       const struct device *dev)
 {
 	struct acpi_device *adev;
+	acpi_handle handle = ACPI_HANDLE(dev);
 
-	if (!ids || !ACPI_HANDLE(dev)
-	    || ACPI_FAILURE(acpi_bus_get_device(ACPI_HANDLE(dev), &adev)))
+	if (!ids || !handle || acpi_bus_get_device(handle, &adev))
 		return NULL;
 
 	return __acpi_match_device(adev, ids);