Messages in this thread Patch in this message | | | Date | Fri, 8 Oct 2010 10:54:27 GMT | From | tip-bot for Jin Dongming <> | Subject | [tip:x86/urgent] x86, mce, therm_throt.c: Fix missing curly braces in error handling logic |
| |
Commit-ID: b62be8ea9db4048112219ff6d6ce5f183179d4dc Gitweb: http://git.kernel.org/tip/b62be8ea9db4048112219ff6d6ce5f183179d4dc Author: Jin Dongming <jin.dongming@np.css.fujitsu.com> AuthorDate: Thu, 26 Aug 2010 17:29:05 +0900 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Fri, 8 Oct 2010 10:29:20 +0200
x86, mce, therm_throt.c: Fix missing curly braces in error handling logic
When the feature PTS is not supported by CPU, the sysfile package_power_limit_count for package should not be generated.
This patch is used for fixing missing { and }.
The patch is not complete as there are other error handling problems in this function - but that can wait until the merge window.
Signed-off-by: Jin Dongming <jin.dongming@np.css.fujitsu.com> Reviewed-by: Fenghua Yu <fenghua.yu@initel.com> Acked-by: Jean Delvare <khali@linux-fr.org> Cc: Brown Len <len.brown@intel.com> Cc: Guenter Roeck <guenter.roeck@ericsson.com> Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Cc: lm-sensors@lm-sensors.org <lm-sensors@lm-sensors.org> LKML-Reference: <4C7625D1.4060201@np.css.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index d9368ee..169d880 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c @@ -216,7 +216,7 @@ static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev, 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)) + 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); @@ -224,6 +224,7 @@ static __cpuinit int thermal_throttle_add_dev(struct sys_device *sys_dev, err = sysfs_add_file_to_group(&sys_dev->kobj, &attr_package_power_limit_count.attr, thermal_attr_group.name); + } return err; }
| |