Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / devfreq / governor_passive.c

diff --git a/drivers/devfreq/governor_passive.c b/drivers/devfreq/governor_passive.c
index 93795b32dc09b1b0af746fc5cdfccf414ad0f209..673ad8cc9a1d093e3db6e2d335742a1aee529953 100644 (file)
--- a/drivers/devfreq/governor_passive.c
+++ b/drivers/devfreq/governor_passive.c
@@ -59,14 +59,14 @@ static int devfreq_passive_get_target_freq(struct devfreq *devfreq,
         * list of parent device. Because in this case, *freq is temporary
         * value which is decided by ondemand governor.
         */
-       rcu_read_lock();
        opp = devfreq_recommended_opp(parent_devfreq->dev.parent, freq, 0);
-       rcu_read_unlock();
        if (IS_ERR(opp)) {
                ret = PTR_ERR(opp);
                goto out;
        }
 
+       dev_pm_opp_put(opp);
+
        /*
         * Get the OPP table's index of decided freqeuncy by governor
         * of parent device.
@@ -112,6 +112,11 @@ static int update_devfreq_passive(struct devfreq *devfreq, unsigned long freq)
        if (ret < 0)
                goto out;
 
+       if (devfreq->profile->freq_table
+               && (devfreq_update_status(devfreq, freq)))
+               dev_err(&devfreq->dev,
+                       "Couldn't update frequency transition information.\n");
+
        devfreq->previous_freq = freq;
 
 out: