Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d2627c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'for-rafael' of... 

Merge branch 'for-rafael' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq

Pull devfreq fix for 3.15-rc1 from MyungJoo Ham.

* 'for-rafael' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: Rewrite devfreq_update_status() to fix multiple bugs
parents dcb99fd9 e35d35a1

drivers/devfreq/devfreq.c

+20 −11
Original line number Original line Diff line number Diff line
@@ -91,26 +91,35 @@ static int devfreq_get_freq_level(struct devfreq *devfreq, unsigned long freq) 
 */

 */

static int devfreq_update_status(struct devfreq *devfreq, unsigned long freq)

static int devfreq_update_status(struct devfreq *devfreq, unsigned long freq)

{

{

	int lev, prev_lev;

	int lev, prev_lev, ret = 0;

	unsigned long cur_time;

	unsigned long cur_time;





	lev = devfreq_get_freq_level(devfreq, freq);

	if (lev < 0)

		return lev;



	cur_time = jiffies;

	cur_time = jiffies;

	devfreq->time_in_state[lev] +=



	prev_lev = devfreq_get_freq_level(devfreq, devfreq->previous_freq);

	if (prev_lev < 0) {

		ret = prev_lev;

		goto out;

	}



	devfreq->time_in_state[prev_lev] +=

			 cur_time - devfreq->last_stat_updated;

			 cur_time - devfreq->last_stat_updated;

	if (freq != devfreq->previous_freq) {



		prev_lev = devfreq_get_freq_level(devfreq,

	lev = devfreq_get_freq_level(devfreq, freq);

						devfreq->previous_freq);

	if (lev < 0) {

		ret = lev;

		goto out;

	}



	if (lev != prev_lev) {

		devfreq->trans_table[(prev_lev *

		devfreq->trans_table[(prev_lev *

				devfreq->profile->max_state) + lev]++;

				devfreq->profile->max_state) + lev]++;

		devfreq->total_trans++;

		devfreq->total_trans++;

	}

	}

	devfreq->last_stat_updated = cur_time;





	return 0;

out:

	devfreq->last_stat_updated = cur_time;

	return ret;

}

}





/**

/**