From 79a04c217c9a85e610fa209218cbb7b05efb5fa9 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 31 Jan 2013 20:54:05 +0100 Subject: [PATCH] --- yaml --- r: 350852 b: refs/heads/master c: 0613e1f7fd98a0cef2a7add1368a87cdd86a1106 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ecb78ef448e1..89d1048bd4bf 100644 --- 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 index 43754655c156..a4224727f09c 100644 --- 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);