ACPI / processor: Fix thermal cooling device regression

spandruvada · rafaeljw · commit ce360db703c9 · 2015-12-21T03:41:49.000+01:00
The processor cooling device is no longer present for passive thermal control. Commit 239708a ("ACPI: Split out ACPI PSS from ACPI Processor driver") moved the processing to a new function acpi_pss_perf_init(), but missed "return 0" after successful creation. This causes the error handling functions to be called, which will delete the previously created processor cooling device. Fixes: 239708a (ACPI: Split out ACPI PSS from ACPI Processor driver) Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Cc: 4.3+ <stable@vger.kernel.org> # 4.3+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
@@ -200,7 +200,8 @@ static int acpi_pss_perf_init(struct acpi_processor *pr,
 		goto err_remove_sysfs_thermal;
 	}
 
-	sysfs_remove_link(&pr->cdev->device.kobj, "device");
+	return 0;
+
  err_remove_sysfs_thermal:
 	sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
  err_thermal_unregister:

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,8 @@ static int acpi_pss_perf_init(struct acpi_processor *pr,`
`200`	`200`	`goto err_remove_sysfs_thermal;`
`201`	`201`	`}`
`202`	`202`
`203`		`- sysfs_remove_link(&pr->cdev->device.kobj, "device");`
	`203`	`+ return 0;`
	`204`	`+`
`204`	`205`	`err_remove_sysfs_thermal:`
`205`	`206`	`sysfs_remove_link(&device->dev.kobj, "thermal_cooling");`
`206`	`207`	`err_thermal_unregister:`