Commit 3b3a0ef6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v6.12-rc4' of...

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

Pull hwmon fix from Guenter Roeck:
 "Fix auto-detect regression in jc42 driver"

* tag 'hwmon-for-v6.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  [PATCH} hwmon: (jc42) Properly detect TSE2004-compliant devices again
parents 5d97dde4 eabb0381
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static int jc42_detect(struct i2c_client *client, struct i2c_board_info *info)
		return -ENODEV;

	if ((devid & TSE2004_DEVID_MASK) == TSE2004_DEVID &&
	    (cap & 0x00e7) != 0x00e7)
	    (cap & 0x0062) != 0x0062)
		return -ENODEV;

	for (i = 0; i < ARRAY_SIZE(jc42_chips); i++) {