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

Commit 93a11c8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon fix from Guenter Roeck:
 "Fix attribute length problem in coretemp driver"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (coretemp) Fix truncated name of alarm attributes
parents 9826dbb1 3f9aec76

drivers/hwmon/coretemp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius"); 




#define BASE_SYSFS_ATTR_NO	2	/* Sysfs Base attr no for coretemp */

#define BASE_SYSFS_ATTR_NO	2	/* Sysfs Base attr no for coretemp */

#define NUM_REAL_CORES		32	/* Number of Real cores per cpu */

#define NUM_REAL_CORES		32	/* Number of Real cores per cpu */

#define CORETEMP_NAME_LENGTH	17	/* String Length of attrs */

#define CORETEMP_NAME_LENGTH	19	/* String Length of attrs */

#define MAX_CORE_ATTRS		4	/* Maximum no of basic attrs */

#define MAX_CORE_ATTRS		4	/* Maximum no of basic attrs */

#define TOTAL_ATTRS		(MAX_CORE_ATTRS + 1)

#define TOTAL_ATTRS		(MAX_CORE_ATTRS + 1)

#define MAX_CORE_DATA		(NUM_REAL_CORES + BASE_SYSFS_ATTR_NO)

#define MAX_CORE_DATA		(NUM_REAL_CORES + BASE_SYSFS_ATTR_NO)