Commit a7f2e10e authored Mar 19, 2025 by Linus Torvalds

Merge tag 'hwmon-fixes-for-v6.14-rc8/6.14' of...

Merge tag 'hwmon-fixes-for-v6.14-rc8/6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - Fix an entry in MAINTAINERS to avoid sending hwmon review requests to
   the i2c mailing list

 - Fix an out-of-bounds access in nct6775 driver

* tag 'hwmon-fixes-for-v6.14-rc8/6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (nct6775-core) Fix out of bounds access for NCT679{8,9}
  MAINTAINERS: correct list and scope of LTC4286 HARDWARE MONITOR

parents 281e2396 815f80ad

MAINTAINERS

+1 −3

Original line number	Diff line number	Diff line
		@@ -13752,12 +13752,10 @@ F: drivers/hwmon/ltc4282.c

		LTC4286 HARDWARE MONITOR DRIVER
		M: Delphine CC Chiu <Delphine_CC_Chiu@Wiwynn.com>
		L: linux-i2c@vger.kernel.org
		L: linux-hwmon@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/hwmon/lltc,ltc4286.yaml
		F: Documentation/hwmon/ltc4286.rst
		F: drivers/hwmon/pmbus/Kconfig
		F: drivers/hwmon/pmbus/Makefile
		F: drivers/hwmon/pmbus/ltc4286.c

		LTC4306 I2C MULTIPLEXER DRIVER

drivers/hwmon/nct6775-core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -273,8 +273,8 @@ static const s8 NCT6776_BEEP_BITS[NUM_BEEP_BITS] = {
		static const u16 NCT6776_REG_TOLERANCE_H[] = {
		0x10c, 0x20c, 0x30c, 0x80c, 0x90c, 0xa0c, 0xb0c };

		static const u8 NCT6776_REG_PWM_MODE[] = { 0x04, 0, 0, 0, 0, 0 };
		static const u8 NCT6776_PWM_MODE_MASK[] = { 0x01, 0, 0, 0, 0, 0 };
		static const u8 NCT6776_REG_PWM_MODE[] = { 0x04, 0, 0, 0, 0, 0, 0 };
		static const u8 NCT6776_PWM_MODE_MASK[] = { 0x01, 0, 0, 0, 0, 0, 0 };

		static const u16 NCT6776_REG_FAN_MIN[] = {
		0x63a, 0x63c, 0x63e, 0x640, 0x642, 0x64a, 0x64c };