diff options
| author | Greg Kroah-Hartman | 2015-10-12 19:49:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-12 19:49:33 +0200 |
| commit | b1630da0589dbf520e4cf565eda6a74c5a813962 (patch) | |
| tree | 290df4d4e49d96ed4df1dfa68ead45991e85cd2e /drivers/cpufreq | |
| parent | USB: u132-hcd: Fix seperate word in printk message (diff) | |
| parent | Linux 4.3-rc5 (diff) | |
| download | kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.tar.gz kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.tar.xz kernel-qcow2-linux-b1630da0589dbf520e4cf565eda6a74c5a813962.zip | |
Merge 4.3-rc5 into usb-next
We want the USB fixes in here as well to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/acpi-cpufreq.c | 3 | ||||
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 798277227de7..cec1ee2d2f74 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -149,6 +149,9 @@ static ssize_t show_freqdomain_cpus(struct cpufreq_policy *policy, char *buf) { struct acpi_cpufreq_data *data = policy->driver_data; + if (unlikely(!data)) + return -ENODEV; + return cpufreq_show_cpus(data->freqdomain_cpus, buf); } diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index ef5ed9470de9..25c4c15103a0 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1436,8 +1436,10 @@ static void cpufreq_offline_finish(unsigned int cpu) * since this is a core component, and is essential for the * subsequent light-weight ->init() to succeed. */ - if (cpufreq_driver->exit) + if (cpufreq_driver->exit) { cpufreq_driver->exit(policy); + policy->freq_table = NULL; + } } /** |