From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 24 Feb 2019 20:18:05 +0000 (+0100)
Subject: Merge back earlier cpufreq material for v5.1.
X-Git-Tag: v5.1-rc1~151^2~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17162a117cd0733ad1db728fa804e62ded9a87d6;p=thirdparty%2Fkernel%2Flinux.git

Merge back earlier cpufreq material for v5.1.
---

17162a117cd0733ad1db728fa804e62ded9a87d6
diff --cc drivers/cpufreq/scmi-cpufreq.c
index 9ed46d188cb5b,66b633b48eb17..c47182fc64ead
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@@ -185,10 -183,9 +183,9 @@@ static int scmi_cpufreq_exit(struct cpu
  {
  	struct scmi_data *priv = policy->driver_data;
  
- 	cpufreq_cooling_unregister(priv->cdev);
  	dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
 -	kfree(priv);
  	dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
 +	kfree(priv);
  
  	return 0;
  }