tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'pm+acpi-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI and power management fixes from Rafael Wysocki:
"These are three stable-candidate fixes, one for the ACPI thermal
driver and two for cpufreq drivers.

Specifics:

- A workqueue is destroyed too early during the ACPI thermal driver
module unload which leads to a NULL pointer dereference in the
driver's remove callback. Fix from Aaron Lu.

- A wrong argument is passed to devm_regulator_get_optional() in the
probe routine of the cpu0 cpufreq driver which leads to resource
leaks if the driver is unbound from the cpufreq platform device.
Fix from Lucas Stach.

- A lock is missing in cpufreq_governor_dbs() which leads to memory
corruption and NULL pointer dereferences during system
suspend/resume, for example. Fix from Bibek Basu"

* tag 'pm+acpi-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / thermal: fix workqueue destroy order
cpufreq: cpu0: drop wrong devm usage
cpufreq: remove race while accessing cur_policy

Linus Torvalds f035b3d3 15a7b60e

+18 -6
+1 -1
drivers/acpi/thermal.c
··· 1278 1278 1279 1279 static void __exit acpi_thermal_exit(void) 1280 1280 { 1281 - destroy_workqueue(acpi_thermal_pm_queue); 1282 1281 acpi_bus_unregister_driver(&acpi_thermal_driver); 1282 + destroy_workqueue(acpi_thermal_pm_queue); 1283 1283 1284 1284 return; 1285 1285 }
+11 -5
drivers/cpufreq/cpufreq-cpu0.c
··· 130 130 return -ENOENT; 131 131 } 132 132 133 - cpu_reg = devm_regulator_get_optional(cpu_dev, "cpu0"); 133 + cpu_reg = regulator_get_optional(cpu_dev, "cpu0"); 134 134 if (IS_ERR(cpu_reg)) { 135 135 /* 136 136 * If cpu0 regulator supply node is present, but regulator is ··· 145 145 PTR_ERR(cpu_reg)); 146 146 } 147 147 148 - cpu_clk = devm_clk_get(cpu_dev, NULL); 148 + cpu_clk = clk_get(cpu_dev, NULL); 149 149 if (IS_ERR(cpu_clk)) { 150 150 ret = PTR_ERR(cpu_clk); 151 151 pr_err("failed to get cpu0 clock: %d\n", ret); 152 - goto out_put_node; 152 + goto out_put_reg; 153 153 } 154 154 155 155 ret = of_init_opp_table(cpu_dev); 156 156 if (ret) { 157 157 pr_err("failed to init OPP table: %d\n", ret); 158 - goto out_put_node; 158 + goto out_put_clk; 159 159 } 160 160 161 161 ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table); 162 162 if (ret) { 163 163 pr_err("failed to init cpufreq table: %d\n", ret); 164 - goto out_put_node; 164 + goto out_put_clk; 165 165 } 166 166 167 167 of_property_read_u32(np, "voltage-tolerance", &voltage_tolerance); ··· 216 216 217 217 out_free_table: 218 218 dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table); 219 + out_put_clk: 220 + if (!IS_ERR(cpu_clk)) 221 + clk_put(cpu_clk); 222 + out_put_reg: 223 + if (!IS_ERR(cpu_reg)) 224 + regulator_put(cpu_reg); 219 225 out_put_node: 220 226 of_node_put(np); 221 227 return ret;
+6
drivers/cpufreq/cpufreq_governor.c
··· 366 366 break; 367 367 368 368 case CPUFREQ_GOV_LIMITS: 369 + mutex_lock(&dbs_data->mutex); 370 + if (!cpu_cdbs->cur_policy) { 371 + mutex_unlock(&dbs_data->mutex); 372 + break; 373 + } 369 374 mutex_lock(&cpu_cdbs->timer_mutex); 370 375 if (policy->max < cpu_cdbs->cur_policy->cur) 371 376 __cpufreq_driver_target(cpu_cdbs->cur_policy, ··· 380 375 policy->min, CPUFREQ_RELATION_L); 381 376 dbs_check_cpu(dbs_data, cpu); 382 377 mutex_unlock(&cpu_cdbs->timer_mutex); 378 + mutex_unlock(&dbs_data->mutex); 383 379 break; 384 380 } 385 381 return 0;