summary refs log tree commit diff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-02-24 02:13:43 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-02-24 02:13:43 +0100
commit351228eaa2aa32e5b3f22747246199807488f5f2 (patch)
treef4fe9aff85ed49d7d61e66dbcbad45c61cc4ac16 /drivers
parent81f70ba233d5f660e1ea5fe23260ee323af5d53a (diff)
parentdbb0c7c430ddbe4299f3580baec0e2503f6f5a93 (diff)
downloadlinux-351228eaa2aa32e5b3f22747246199807488f5f2.tar.gz
Merge branch 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq
Pull a devfreq fix for v4.5 from MyungJoo Ham.

* 'for-rafael' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: tegra: Set freq in rate callback
Diffstat (limited to 'drivers')
-rw-r--r--drivers/devfreq/tegra-devfreq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/devfreq/tegra-devfreq.c b/drivers/devfreq/tegra-devfreq.c
index 848b93ee930f..fe9dce0245bf 100644
--- a/drivers/devfreq/tegra-devfreq.c
+++ b/drivers/devfreq/tegra-devfreq.c
@@ -500,6 +500,8 @@ static int tegra_devfreq_target(struct device *dev, unsigned long *freq,
 	clk_set_min_rate(tegra->emc_clock, rate);
 	clk_set_rate(tegra->emc_clock, 0);
 
+	*freq = rate;
+
 	return 0;
 }