]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ACPI / processor: Fix thermal cooling device regression
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Thu, 17 Dec 2015 04:32:23 +0000 (20:32 -0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 21 Dec 2015 02:41:49 +0000 (03:41 +0100)
The processor cooling device is no longer present for passive thermal
control.

Commit 239708a3af44 ("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: 239708a3af44 (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>
drivers/acpi/processor_driver.c

index f4e02ae93f585fbb8de42c09d4d0fb32d2751887..11154a330f075dc04c0fec99299d6f5000e901be 100644 (file)
@@ -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: