Skip to content

Commit 2c96961

Browse files
committed
Merge tag 'pm+acpi-4.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI fixes from Rafael Wysocki: "These fix an ACPI processor driver regression introduced during the 4.3 cycle and a mistake in the recently added SCPI support in the arm_big_little cpufreq driver. Specifics: - Fix a thermal management issue introduced by an ACPI processor driver change made during the 4.3 development cycle that failed to return 0 from a function on success which triggered an error cleanup path every time it had been called that deleted useful data structures created previously (Srinivas Pandruvada). - Fix a variable data type issue in the arm_big_little cpufreq driver's SCPI support code added recently that prevents error handling in there from working correctly (Dan Carpenter)" * tag 'pm+acpi-4.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: scpi-cpufreq: signedness bug in scpi_get_dvfs_info() ACPI / processor: Fix thermal cooling device regression
2 parents f0cf008 + 43b28ca commit 2c96961

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/acpi/processor_driver.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ static int acpi_pss_perf_init(struct acpi_processor *pr,
200200
goto err_remove_sysfs_thermal;
201201
}
202202

203-
sysfs_remove_link(&pr->cdev->device.kobj, "device");
203+
return 0;
204+
204205
err_remove_sysfs_thermal:
205206
sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
206207
err_thermal_unregister:

drivers/cpufreq/scpi-cpufreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static struct scpi_ops *scpi_ops;
3131

3232
static struct scpi_dvfs_info *scpi_get_dvfs_info(struct device *cpu_dev)
3333
{
34-
u8 domain = topology_physical_package_id(cpu_dev->id);
34+
int domain = topology_physical_package_id(cpu_dev->id);
3535

3636
if (domain < 0)
3737
return ERR_PTR(-EINVAL);

0 commit comments

Comments
 (0)