diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-06 09:06:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-08 14:26:34 +0200 |
| commit | cfbed9b55636334f19059660b197fdffd40b8865 (patch) | |
| tree | 999a6317c6b17934323284323b9b565aaf2d716c | |
| parent | a99aaeccdefdeed566861b867f43cdd18573ad29 (diff) | |
| download | linux-stable-cfbed9b55636334f19059660b197fdffd40b8865.tar.gz linux-stable-cfbed9b55636334f19059660b197fdffd40b8865.tar.bz2 linux-stable-cfbed9b55636334f19059660b197fdffd40b8865.zip | |
Revert "cpufreq: Fix governor module removal race"
This reverts commit 0049457bfde661cf47410eaacad65845c9a2bb45 which was
commit a8b149d32b663c1a4105273295184b78f53d33cf upstream.
The backport was not correct, so just drop it entirely.
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index bb1e148ebfd4..ea43b147a7fe 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -631,8 +631,6 @@ static int cpufreq_parse_governor(char *str_governor, unsigned int *policy, *governor = t; err = 0; } - if (t && !try_module_get(t->owner)) - t = NULL; mutex_unlock(&cpufreq_governor_mutex); } @@ -761,10 +759,6 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy, return -EINVAL; ret = cpufreq_set_policy(policy, &new_policy); - - if (new_policy.governor) - module_put(new_policy.governor->owner); - return ret ? ret : count; } |