From patchwork Thu Dec 17 04:32:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: srinivas pandruvada X-Patchwork-Id: 7869401 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3B9509F349 for ; Thu, 17 Dec 2015 04:34:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74E50201BB for ; Thu, 17 Dec 2015 04:34:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92FE0200D4 for ; Thu, 17 Dec 2015 04:34:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750811AbbLQEee (ORCPT ); Wed, 16 Dec 2015 23:34:34 -0500 Received: from mga01.intel.com ([192.55.52.88]:27531 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750985AbbLQEee (ORCPT ); Wed, 16 Dec 2015 23:34:34 -0500 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 16 Dec 2015 20:34:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,439,1444719600"; d="scan'208";a="619341890" Received: from jcjohn-mobl.amr.corp.intel.com (HELO spandruv-mobl3.jf.intel.com) ([10.254.181.117]) by FMSMGA003.fm.intel.com with ESMTP; 16 Dec 2015 20:34:15 -0800 From: Srinivas Pandruvada To: rafael@kernel.org Cc: len.brown@intel.com, rui.zhang@intel.com, linux-pm@vger.kernel.org, Srinivas Pandruvada Subject: [PATCH] ACPI: processor thermal cooling device regression Date: Wed, 16 Dec 2015 20:32:23 -0800 Message-Id: <1450326743-9460-1-git-send-email-srinivas.pandruvada@linux.intel.com> X-Mailer: git-send-email 2.4.3 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The processor cooling device is no longer present for passive thermal control. The change commit 239708a3af44 ("ACPI: Split out ACPI PSS from ACPI Processor driver") moved the processing to a new function acpi_pss_perf_init, but missing "return 0" after successful creation. This causes the error handling functions to be called, which will delete the previously created processor cooling device. Signed-off-by: Srinivas Pandruvada --- drivers/acpi/processor_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index f4e02ae..11154a3 100644 --- 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: