Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md

[karo-tx-linux.git] / drivers / acpi / device_pm.c

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 28938b5a334e1297cfe230a8290b5cfb38a7f9e9..2ed6935d4483bb0139e1ed9cc4cf27854c328c0d 100644 (file)
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -262,8 +262,10 @@ int acpi_bus_init_power(struct acpi_device *device)
                return -EINVAL;
 
        device->power.state = ACPI_STATE_UNKNOWN;
-       if (!acpi_device_is_present(device))
+       if (!acpi_device_is_present(device)) {
+               device->flags.initialized = false;
                return -ENXIO;
+       }
 
        result = acpi_device_get_power(device, &state);
        if (result)