Commit 2c96961f authored Dec 26, 2015 by Linus Torvalds

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

parents f0cf008f 43b28ca8

drivers/acpi/processor_driver.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -200,7 +200,8 @@ static int acpi_pss_perf_init(struct acpi_processor *pr,
	goto err_remove_sysfs_thermal;		goto err_remove_sysfs_thermal;
	}		}

	sysfs_remove_link(&pr->cdev->device.kobj, "device");		return 0;

	err_remove_sysfs_thermal:		err_remove_sysfs_thermal:
	sysfs_remove_link(&device->dev.kobj, "thermal_cooling");		sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
	err_thermal_unregister:		err_thermal_unregister:

drivers/cpufreq/scpi-cpufreq.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ static struct scpi_ops *scpi_ops;

	static struct scpi_dvfs_info scpi_get_dvfs_info(struct device cpu_dev)		static struct scpi_dvfs_info scpi_get_dvfs_info(struct device cpu_dev)
	{		{
	u8 domain = topology_physical_package_id(cpu_dev->id);		int domain = topology_physical_package_id(cpu_dev->id);

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