Commit 14a244a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v6.11-rc7' of... 

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
parents 1263a7bf a54da9df

drivers/hwmon/hp-wmi-sensors.c

+2 −0
Original line number Diff line number Diff line
@@ -1637,6 +1637,8 @@ static void hp_wmi_notify(u32 value, void *context) 
		goto out_unlock;



	wobj = out.pointer;

	if (!wobj)

		goto out_unlock;



	err = populate_event_from_wobj(dev, &event, wobj);

	if (err) {

drivers/hwmon/ltc2991.c

+3 −3
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ 
#define LTC2991_V7_V8_FILT_EN		BIT(7)

#define LTC2991_V7_V8_TEMP_EN		BIT(5)

#define LTC2991_V7_V8_DIFF_EN		BIT(4)

#define LTC2991_V5_V6_FILT_EN		BIT(7)

#define LTC2991_V5_V6_TEMP_EN		BIT(5)

#define LTC2991_V5_V6_DIFF_EN		BIT(4)

#define LTC2991_V5_V6_FILT_EN		BIT(3)

#define LTC2991_V5_V6_TEMP_EN		BIT(1)

#define LTC2991_V5_V6_DIFF_EN		BIT(0)



#define LTC2991_REPEAT_ACQ_EN		BIT(4)

#define LTC2991_T_INT_FILT_EN		BIT(3)