Merge branch 'power' into release

diff --combined drivers/acpi/power.c
index 81f583f8098b5cbc85fc0fd341ed9e3cade5b82f,89111cd28ed86d0ca441ccba2769af5771c614a2..bb7d50dd28186d3c1d7e5d3d1bdb735aeab1944c
--- 1/drivers/acpi/power.c
--- 2/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@@ -44,8 -44,9 +44,8 @@@
  #include <acpi/acpi_bus.h>
  #include <acpi/acpi_drivers.h>
  
 -#define _COMPONENT            ACPI_POWER_COMPONENT
 +#define _COMPONENT                    ACPI_POWER_COMPONENT
  ACPI_MODULE_NAME("power");
 -#define ACPI_POWER_COMPONENT          0x00800000
  #define ACPI_POWER_CLASS              "power_resource"
  #define ACPI_POWER_DEVICE_NAME                "Power Resource"
  #define ACPI_POWER_FILE_INFO          "info"
@@@ -152,7 -153,8 +152,8 @@@ static int acpi_power_get_state(acpi_ha
                              ACPI_POWER_RESOURCE_STATE_OFF;
  
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] is %s\n",
-                         acpi_ut_get_node_name(handle), state ? "on" : "off"));
+                         acpi_ut_get_node_name(handle),
+                               *state ? "on" : "off"));
  
        return 0;
  }
@@@ -515,11 -517,6 +516,6 @@@ int acpi_power_transition(struct acpi_d
        cl = &device->power.states[device->power.state].resources;
        tl = &device->power.states[state].resources;
  
-       if (!cl->count && !tl->count) {
-               result = -ENODEV;
-               goto end;
-       }
- 
        /* TBD: Resources must be ordered. */
  
        /*