2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index dd49ea0d0ed3..e5084ececb6f 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -103,7 +103,9 @@ int acpi_bus_get_status(struct acpi_device *device)
         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 --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index bb0e0da39fb1..d80dd84e5bfd 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1068,7 +1068,9 @@ acpi_add_single_object(struct acpi_device **child,
                 }
                 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;
         }