tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull hwmon fixes from Guenter Roeck:

- corsair-psu: Fix typo in USB id description, and add USB ID for new
PSU

- pwm-fan: Fix fan power handling when disabling fan control

* tag 'hwmon-for-v6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (corsair-psu) Add USB id of the new HX1500i psu
hwmon: (pwm-fan) Explicitly switch off fan power when setting pwm1_enable to 0
hwmon: (corsair-psu) fix typo in USB id description

Linus Torvalds d47136c2 cda5d920

+8 -2
+2
Documentation/hwmon/corsair-psu.rst
··· 19 19 20 20 Corsair HX1200i 21 21 22 + Corsair HX1500i 23 + 22 24 Corsair RM550i 23 25 24 26 Corsair RM650i
+2 -1
drivers/hwmon/corsair-psu.c
··· 820 820 { HID_USB_DEVICE(0x1b1c, 0x1c0b) }, /* Corsair RM750i */ 821 821 { HID_USB_DEVICE(0x1b1c, 0x1c0c) }, /* Corsair RM850i */ 822 822 { HID_USB_DEVICE(0x1b1c, 0x1c0d) }, /* Corsair RM1000i */ 823 - { HID_USB_DEVICE(0x1b1c, 0x1c1e) }, /* Corsaur HX1000i revision 2 */ 823 + { HID_USB_DEVICE(0x1b1c, 0x1c1e) }, /* Corsair HX1000i revision 2 */ 824 + { HID_USB_DEVICE(0x1b1c, 0x1c1f) }, /* Corsair HX1500i */ 824 825 { }, 825 826 }; 826 827 MODULE_DEVICE_TABLE(hid, corsairpsu_idtable);
+4 -1
drivers/hwmon/pwm-fan.c
··· 257 257 258 258 if (val == 0) { 259 259 /* Disable pwm-fan unconditionally */ 260 - ret = __set_pwm(ctx, 0); 260 + if (ctx->enabled) 261 + ret = __set_pwm(ctx, 0); 262 + else 263 + ret = pwm_fan_switch_power(ctx, false); 261 264 if (ret) 262 265 ctx->enable_mode = old_val; 263 266 pwm_fan_update_state(ctx, 0);