From: Bjorn Helgaas Be explicit about what "device->status = 0x0F" really means. Signed-off-by: Bjorn Helgaas Cc: Len Brown Signed-off-by: Andrew Morton --- drivers/acpi/bus.c | 4 +++- drivers/acpi/scan.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff -puN drivers/acpi/bus.c~acpi-use-_sta-bit-names-rather-than-0x0f drivers/acpi/bus.c --- a/drivers/acpi/bus.c~acpi-use-_sta-bit-names-rather-than-0x0f +++ a/drivers/acpi/bus.c @@ -103,7 +103,9 @@ int acpi_bus_get_status(struct acpi_devi else if (device->parent) device->status = device->parent->status; else - STRUCT_TO_INT(device->status) = 0x0F; + STRUCT_TO_INT(device->status) = + ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED | + ACPI_STA_DEVICE_UI | ACPI_STA_DEVICE_FUNCTIONING; if (device->status.functional && !device->status.present) { printk(KERN_WARNING PREFIX "Device [%s] status [%08x]: " diff -puN drivers/acpi/scan.c~acpi-use-_sta-bit-names-rather-than-0x0f drivers/acpi/scan.c --- a/drivers/acpi/scan.c~acpi-use-_sta-bit-names-rather-than-0x0f +++ a/drivers/acpi/scan.c @@ -1068,7 +1068,9 @@ acpi_add_single_object(struct acpi_devic } break; default: - STRUCT_TO_INT(device->status) = 0x0F; + STRUCT_TO_INT(device->status) = + ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED | + ACPI_STA_DEVICE_UI | ACPI_STA_DEVICE_FUNCTIONING; break; } _