Skip to content

Commit a7f2e10

Browse files
committed
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
2 parents 281e239 + 815f80a commit a7f2e10

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Diff for: MAINTAINERS

+1-3
Original file line numberDiff line numberDiff line change
@@ -13752,12 +13752,10 @@ F: drivers/hwmon/ltc4282.c
1375213752

1375313753
LTC4286 HARDWARE MONITOR DRIVER
1375413754
M: Delphine CC Chiu <[email protected]>
13755-
L: linux-i2c@vger.kernel.org
13755+
L: linux-hwmon@vger.kernel.org
1375613756
S: Maintained
1375713757
F: Documentation/devicetree/bindings/hwmon/lltc,ltc4286.yaml
1375813758
F: Documentation/hwmon/ltc4286.rst
13759-
F: drivers/hwmon/pmbus/Kconfig
13760-
F: drivers/hwmon/pmbus/Makefile
1376113759
F: drivers/hwmon/pmbus/ltc4286.c
1376213760

1376313761
LTC4306 I2C MULTIPLEXER DRIVER

Diff for: drivers/hwmon/nct6775-core.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ static const s8 NCT6776_BEEP_BITS[NUM_BEEP_BITS] = {
273273
static const u16 NCT6776_REG_TOLERANCE_H[] = {
274274
0x10c, 0x20c, 0x30c, 0x80c, 0x90c, 0xa0c, 0xb0c };
275275

276-
static const u8 NCT6776_REG_PWM_MODE[] = { 0x04, 0, 0, 0, 0, 0 };
277-
static const u8 NCT6776_PWM_MODE_MASK[] = { 0x01, 0, 0, 0, 0, 0 };
276+
static const u8 NCT6776_REG_PWM_MODE[] = { 0x04, 0, 0, 0, 0, 0, 0 };
277+
static const u8 NCT6776_PWM_MODE_MASK[] = { 0x01, 0, 0, 0, 0, 0, 0 };
278278

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

0 commit comments

Comments
 (0)