Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b62be8ea authored by Jin Dongming's avatar Jin Dongming Committed by Ingo Molnar
Browse files

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: default avatarJin Dongming <jin.dongming@np.css.fujitsu.com>
Reviewed-by: default avatarFenghua Yu <fenghua.yu@initel.com>
Acked-by: default avatarJean 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: default avatarIngo Molnar <mingo@elte.hu>
parent 6b0cd00b

arch/x86/kernel/cpu/mcheck/therm_throt.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -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,

		err = sysfs_add_file_to_group(&sys_dev->kobj,

					      &attr_core_power_limit_count.attr,

					      &attr_core_power_limit_count.attr,

					      thermal_attr_group.name);

					      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,

		err = sysfs_add_file_to_group(&sys_dev->kobj,

					      &attr_package_throttle_count.attr,

					      &attr_package_throttle_count.attr,

					      thermal_attr_group.name);

					      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,

			err = sysfs_add_file_to_group(&sys_dev->kobj,

					&attr_package_power_limit_count.attr,

					&attr_package_power_limit_count.attr,

					thermal_attr_group.name);

					thermal_attr_group.name);

	}





	return err;

	return err;

}

}