summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/cpufreq.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-09-30 22:08:39 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-09-30 22:08:39 +0200
commit7f9558e14cfd43999da325008262a2c6d638a527 (patch)
treec6ee1a6cb31ba271e2db124d328df7c4c1f54ad2 /drivers/cpufreq/cpufreq.c
parentd51aea13dd6753186a2bea7619029c460bdf0c4c (diff)
parentd1e1303173d7fe3c107a85805a62c13e760f2da4 (diff)
downloadlinux-7f9558e14cfd43999da325008262a2c6d638a527.tar.bz2
Merge back earlier cpufreq material for 4.20.
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
-rw-r--r--drivers/cpufreq/cpufreq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index f53fb41efb7b..7aa3dcad2175 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -403,7 +403,7 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_transition_begin);
void cpufreq_freq_transition_end(struct cpufreq_policy *policy,
struct cpufreq_freqs *freqs, int transition_failed)
{
- if (unlikely(WARN_ON(!policy->transition_ongoing)))
+ if (WARN_ON(!policy->transition_ongoing))
return;
cpufreq_notify_post_transition(policy, freqs, transition_failed);