Re: [PATCH 3/16][BUG] ACPI pci_slot: Fix _STA evaluation (Not for mainline!)

Alex Chiang
2008-03-21T16:17:40Z

* Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>:
> Fix the problem that pci slots that doesn't have _STA are not
> detected. If the device doesn't have _STA, we must assume it is always
> there.

Merged, thanks.

/ac

>
> Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
> ---
> drivers/acpi/pci_slot.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> Index: linux-2.6.25-rc6/drivers/acpi/pci_slot.c
> ===================================================================
> --- linux-2.6.25-rc6.orig/drivers/acpi/pci_slot.c
> +++ linux-2.6.25-rc6/drivers/acpi/pci_slot.c
> @@ -76,9 +76,8 @@ check_slot(acpi_handle handle, int *devi
>
> if (check_sta_before_sun) {
> /* If SxFy doesn't have _STA, we just assume it's there */
> - acpi_evaluate_integer(handle, "_STA", NULL, &sta);
> -
> - if (!(sta & ACPI_STA_DEVICE_PRESENT)) {
> + status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
> + if (ACPI_SUCCESS(status) && !(sta & ACPI_STA_DEVICE_PRESENT)) {
> retval = -1;
> goto out;
> }
>
>