1 files changed, 16 insertions, 14 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index c26468da4295..dd49ea0d0ed3 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -39,7 +39,7 @@
 #include <acpi/acpi_drivers.h>
 
 #define _COMPONENT              ACPI_BUS_COMPONENT
-ACPI_MODULE_NAME("acpi_bus")
+ACPI_MODULE_NAME("bus");
 #ifdef  CONFIG_X86
 extern void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger);
 #endif
@@ -147,7 +147,7 @@ int acpi_bus_get_power(acpi_handle handle, int *state)
                         *state = ACPI_STATE_D0;
         } else {
                 /*
-                 * Get the device's power state either directly (via _PSC) or 
+                 * Get the device's power state either directly (via _PSC) or
                  * indirectly (via power resources).
                  */
                 if (device->power.flags.explicit_get) {
@@ -199,15 +199,14 @@ int acpi_bus_set_power(acpi_handle handle, int state)
          * Get device's current power state if it's unknown
          * This means device power state isn't initialized or previous setting failed
          */
-        if (!device->flags.force_power_state) {
-                if (device->power.state == ACPI_STATE_UNKNOWN)
-                        acpi_bus_get_power(device->handle, &device->power.state);
-                if (state == device->power.state) {
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
-                                          state));
-                        return 0;
-                }
+        if ((device->power.state == ACPI_STATE_UNKNOWN) || device->flags.force_power_state)
+                acpi_bus_get_power(device->handle, &device->power.state);
+        if ((state == device->power.state) && !device->flags.force_power_state) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at D%d\n",
+                                  state));
+                return 0;
         }
+
         if (!device->power.states[state].flags.valid) {
                 printk(KERN_WARNING PREFIX "Device does not support D%d\n", state);
                 return -ENODEV;
@@ -462,7 +461,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
                                   "Received BUS CHECK notification for device [%s]\n",
                                   device->pnp.bus_id));
                 result = acpi_bus_check_scope(device);
-                /* 
+                /*
                  * TBD: We'll need to outsource certain events to non-ACPI
                  *      drivers via the device manager (device.c).
                  */
@@ -473,7 +472,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
                                   "Received DEVICE CHECK notification for device [%s]\n",
                                   device->pnp.bus_id));
                 result = acpi_bus_check_device(device, NULL);
-                /* 
+                /*
                  * TBD: We'll need to outsource certain events to non-ACPI
                  *      drivers via the device manager (device.c).
                  */
@@ -543,7 +542,7 @@ static int __init acpi_bus_init_irq(void)
         char *message = NULL;
 
 
-        /* 
+        /*
          * Let the system know what interrupt model we are using by
          * evaluating the \_PIC object, if exists.
          */
@@ -684,7 +683,7 @@ static int __init acpi_bus_init(void)
          * the EC device is found in the namespace (i.e. before acpi_initialize_objects()
          * is called).
          *
-         * This is accomplished by looking for the ECDT table, and getting 
+         * This is accomplished by looking for the ECDT table, and getting
          * the EC parameters out of that.
          */
         status = acpi_ec_ecdt_probe();
@@ -699,6 +698,9 @@ static int __init acpi_bus_init(void)
 
         printk(KERN_INFO PREFIX "Interpreter enabled\n");
 
+        /* Initialize sleep structures */
+        acpi_sleep_init();
+
         /*
          * Get the system interrupt model and evaluate \_PIC.
          */