Re: [PATCH 1/2] ACPI / scan: Fix acpi_bus_get_device() check in acpi_match_device()

Yinghai Lu
2013-01-31T18:38:17Z

On Wed, Jan 30, 2013 at 2:03 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Since acpi_bus_get_device() returns int and not acpi_status, change
> acpi_match_device() so that it doesn't apply ACPI_FAILURE() to the
> return value of acpi_bus_get_device().
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> drivers/acpi/scan.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-pm/drivers/acpi/scan.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/scan.c
> +++ linux-pm/drivers/acpi/scan.c
> @@ -491,9 +491,9 @@ const struct acpi_device_id *acpi_match_
> 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);
>

Acked-by: Yinghai Lu <yinghai@kernel.org>