Commit ce360db7 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Rafael J. Wysocki

ACPI / processor: Fix thermal cooling device regression

The processor cooling device is no longer present for passive thermal
control.

Commit 239708a3 ("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: 239708a3 (ACPI: Split out ACPI PSS from ACPI Processor driver)
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: 4.3+ <stable@vger.kernel.org> # 4.3+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 4ef76753
...@@ -200,7 +200,8 @@ static int acpi_pss_perf_init(struct acpi_processor *pr, ...@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment