7 files changed, 29 insertions, 17 deletions

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index e9e8bb24785b..4ab807dc8518 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -324,14 +324,27 @@ int acpi_bus_update_power(acpi_handle handle, int *state_p)
         if (result)
                 return result;
 
-        if (state == ACPI_STATE_UNKNOWN)
+        if (state == ACPI_STATE_UNKNOWN) {
                 state = ACPI_STATE_D0;
-
-        result = acpi_device_set_power(device, state);
-        if (!result && state_p)
+                result = acpi_device_set_power(device, state);
+                if (result)
+                        return result;
+        } else {
+                if (device->power.flags.power_resources) {
+                        /*
+                         * We don't need to really switch the state, bu we need
+                         * to update the power resources' reference counters.
+                         */
+                        result = acpi_power_transition(device, state);
+                        if (result)
+                                return result;
+                }
+                device->power.state = state;
+        }
+        if (state_p)
                 *state_p = state;
 
-        return result;
+        return 0;
 }
 EXPORT_SYMBOL_GPL(acpi_bus_update_power);
 
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 14de9f46972e..826560753389 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -1064,10 +1064,10 @@ find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
         return AE_OK;
 }
 
-int __init acpi_dock_init(void)
+void __init acpi_dock_init(void)
 {
         if (acpi_disabled)
-                return 0;
+                return;
 
         /* look for dock stations and bays */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
@@ -1075,11 +1075,10 @@ int __init acpi_dock_init(void)
 
         if (!dock_station_count) {
                 pr_info(PREFIX "No dock devices found.\n");
-                return 0;
+                return;
         }
 
         register_acpi_bus_notifier(&dock_acpi_notifier);
         pr_info(PREFIX "%s: %d docks/bays found\n",
                 ACPI_DOCK_DRIVER_DESCRIPTION, dock_station_count);
-        return 0;
 }
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 8d1c0105e113..5b02a0aa540c 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -84,7 +84,7 @@ static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
 {
         struct acpi_device *device = cdev->devdata;
         int result;
-        int acpi_state;
+        int acpi_state = ACPI_STATE_D0;
 
         if (!device)
                 return -EINVAL;
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 288bb270f8ed..5c28c894c0fc 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -279,7 +279,7 @@ static int acpi_power_on_unlocked(struct acpi_power_resource *resource)
 
         if (resource->ref_count++) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Power resource [%s] already on",
+                                  "Power resource [%s] already on\n",
                                   resource->name));
         } else {
                 result = __acpi_power_on(resource);
@@ -325,7 +325,7 @@ static int acpi_power_off_unlocked(struct acpi_power_resource *resource)
 
         if (!resource->ref_count) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "Power resource [%s] already off",
+                                  "Power resource [%s] already off\n",
                                   resource->name));
                 return 0;
         }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index dfe76f17cfc4..10985573aaa7 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -35,7 +35,6 @@ bool acpi_force_hot_remove;
 
 static const char *dummy_hid = "device";
 
-static LIST_HEAD(acpi_device_list);
 static LIST_HEAD(acpi_bus_id_list);
 static DEFINE_MUTEX(acpi_scan_lock);
 static LIST_HEAD(acpi_scan_handlers_list);
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 6a015ada5285..0937b8d6c2a4 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -312,11 +312,12 @@ static void __cpufreq_notify_transition(struct cpufreq_policy *policy,
         switch (state) {
 
         case CPUFREQ_PRECHANGE:
-                if (WARN(policy->transition_ongoing,
+                if (WARN(policy->transition_ongoing ==
+                                        cpumask_weight(policy->cpus),
                                 "In middle of another frequency transition\n"))
                         return;
 
-                policy->transition_ongoing = true;
+                policy->transition_ongoing++;
 
                 /* detect if the driver reported a value as "old frequency"
                  * which is not equal to what the cpufreq core thinks is
@@ -341,7 +342,7 @@ static void __cpufreq_notify_transition(struct cpufreq_policy *policy,
                                 "No frequency transition in progress\n"))
                         return;
 
-                policy->transition_ongoing = false;
+                policy->transition_ongoing--;
 
                 adjust_jiffies(CPUFREQ_POSTCHANGE, freqs);
                 pr_debug("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new,
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 4d7390bc1727..90d5a15120d5 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -119,7 +119,7 @@ struct cpufreq_policy {
 
         struct kobject          kobj;
         struct completion       kobj_unregister;
-        bool                    transition_ongoing; /* Tracks transition status */
+        int                     transition_ongoing; /* Tracks transition status */
 };
 
 #define CPUFREQ_ADJUST                  (0)