From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753525Ab0ICAzf (ORCPT ); Thu, 2 Sep 2010 20:55:35 -0400 Received: from mga09.intel.com ([134.134.136.24]:37454 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752012Ab0ICAzd (ORCPT ); Thu, 2 Sep 2010 20:55:33 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.56,310,1280732400"; d="scan'208";a="551221477" From: "Fenghua Yu" To: "Ingo Molnar" , "Thomas Gleixner" , "H Peter Anvin" , "Len Brown" , "Jin Dongming" , "Hidetoshi Seto" , "Jean Delvare" Cc: "linux-kernel" , "lm-sensors" , Fenghua Yu Subject: [PATCH] therm_throt.c: Fix error handling in thermal_throttle_add_dev Date: Thu, 2 Sep 2010 17:45:26 -0700 Message-Id: <1283474726-20109-1-git-send-email-fenghua.yu@intel.com> X-Mailer: git-send-email 1.7.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fenghua Yu Warn when sysfs_add_file_to_group fails. Also add missing curly braces. Signed-off-by: Fenghua Yu --- arch/x86/kernel/cpu/mcheck/therm_throt.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index c2a8b26..4c3cd62 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c @@ -211,20 +211,26 @@ static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev) if (err) return err; - if (cpu_has(c, X86_FEATURE_PLN)) + if (cpu_has(c, X86_FEATURE_PLN)) { err = sysfs_add_file_to_group(&sys_dev->kobj, &attr_core_power_limit_count.attr, thermal_attr_group.name); - if (cpu_has(c, X86_FEATURE_PTS)) + WARN_ON(err); + } + if (cpu_has(c, X86_FEATURE_PTS)) { err = sysfs_add_file_to_group(&sys_dev->kobj, &attr_package_throttle_count.attr, thermal_attr_group.name); - if (cpu_has(c, X86_FEATURE_PLN)) + WARN_ON(err); + if (cpu_has(c, X86_FEATURE_PLN)) { err = sysfs_add_file_to_group(&sys_dev->kobj, &attr_package_power_limit_count.attr, thermal_attr_group.name); + WARN_ON(err); + } + } - return err; + return 0; } static __cpuinit void thermal_throttle_remove_dev(struct sys_device *sys_dev) -- 1.6.0.3