Skip to content

Commit 14a244a

Browse files
committed
Merge tag 'hwmon-for-v6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck: - hp-wmi-sensors: Check if WMI event data exists before accessing it - ltc2991: fix register bits defines * tag 'hwmon-for-v6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (hp-wmi-sensors) Check if WMI event data exists hwmon: ltc2991: fix register bits defines
2 parents 1263a7b + a54da9d commit 14a244a

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/hwmon/hp-wmi-sensors.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,6 +1637,8 @@ static void hp_wmi_notify(u32 value, void *context)
16371637
goto out_unlock;
16381638

16391639
wobj = out.pointer;
1640+
if (!wobj)
1641+
goto out_unlock;
16401642

16411643
err = populate_event_from_wobj(dev, &event, wobj);
16421644
if (err) {

drivers/hwmon/ltc2991.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
#define LTC2991_V7_V8_FILT_EN BIT(7)
4343
#define LTC2991_V7_V8_TEMP_EN BIT(5)
4444
#define LTC2991_V7_V8_DIFF_EN BIT(4)
45-
#define LTC2991_V5_V6_FILT_EN BIT(7)
46-
#define LTC2991_V5_V6_TEMP_EN BIT(5)
47-
#define LTC2991_V5_V6_DIFF_EN BIT(4)
45+
#define LTC2991_V5_V6_FILT_EN BIT(3)
46+
#define LTC2991_V5_V6_TEMP_EN BIT(1)
47+
#define LTC2991_V5_V6_DIFF_EN BIT(0)
4848

4949
#define LTC2991_REPEAT_ACQ_EN BIT(4)
5050
#define LTC2991_T_INT_FILT_EN BIT(3)

0 commit comments

Comments
 (0)