summaryrefslogtreecommitdiffstats
path: root/drivers/devfreq/tegra-devfreq.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-03-08 11:48:00 +0100
committerIngo Molnar <mingo@kernel.org>2016-03-08 11:48:00 +0100
commita1a8ba2d4a7cf9884b97b733b45692f9114c5132 (patch)
tree3b342c5071c347bdfa0fe6bf9274c30c75ea18d3 /drivers/devfreq/tegra-devfreq.c
parentb2f9d678e28ca71ce650eac82f26dd287b47e89a (diff)
parente2857b8f11a289ed2b61d18d0665e05c1053c446 (diff)
downloadtalos-op-linux-a1a8ba2d4a7cf9884b97b733b45692f9114c5132.tar.gz
talos-op-linux-a1a8ba2d4a7cf9884b97b733b45692f9114c5132.zip
Merge branch 'linus' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/devfreq/tegra-devfreq.c')
-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;
}
OpenPOWER on IntegriCloud