nvmet-tcp: fix inline data size comparison in nvmet_tcp_queue_response

[linux-2.6-microblaze.git] / drivers / devfreq / devfreq.c

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index bf30478..fe08c46 100644 (file)
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -11,6 +11,7 @@
 #include <linux/kmod.h>
 #include <linux/sched.h>
 #include <linux/debugfs.h>
+#include <linux/devfreq_cooling.h>
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -387,7 +388,7 @@ static int devfreq_set_target(struct devfreq *devfreq, unsigned long new_freq,
        devfreq->previous_freq = new_freq;
 
        if (devfreq->suspend_freq)
-               devfreq->resume_freq = cur_freq;
+               devfreq->resume_freq = new_freq;
 
        return err;
 }
@@ -821,7 +822,8 @@ struct devfreq *devfreq_add_device(struct device *dev,
 
        if (devfreq->profile->timer < 0
                || devfreq->profile->timer >= DEVFREQ_TIMER_NUM) {
-               goto err_out;
+               mutex_unlock(&devfreq->lock);
+               goto err_dev;
        }
 
        if (!devfreq->profile->max_state && !devfreq->profile->freq_table) {
@@ -935,6 +937,12 @@ struct devfreq *devfreq_add_device(struct device *dev,
 
        mutex_unlock(&devfreq_list_lock);
 
+       if (devfreq->profile->is_cooling_device) {
+               devfreq->cdev = devfreq_cooling_em_register(devfreq, NULL);
+               if (IS_ERR(devfreq->cdev))
+                       devfreq->cdev = NULL;
+       }
+
        return devfreq;
 
 err_init:
@@ -960,6 +968,8 @@ int devfreq_remove_device(struct devfreq *devfreq)
        if (!devfreq)
                return -EINVAL;
 
+       devfreq_cooling_unregister(devfreq->cdev);
+
        if (devfreq->governor) {
                devfreq->governor->event_handler(devfreq,
                                                 DEVFREQ_GOV_STOP, NULL);