Skip to content

Commit d47136c

Browse files
committed
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
2 parents cda5d92 + 5619c66 commit d47136c

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

Documentation/hwmon/corsair-psu.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Supported devices:
1919

2020
Corsair HX1200i
2121

22+
Corsair HX1500i
23+
2224
Corsair RM550i
2325

2426
Corsair RM650i

drivers/hwmon/corsair-psu.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,8 @@ static const struct hid_device_id corsairpsu_idtable[] = {
820820
{ HID_USB_DEVICE(0x1b1c, 0x1c0b) }, /* Corsair RM750i */
821821
{ HID_USB_DEVICE(0x1b1c, 0x1c0c) }, /* Corsair RM850i */
822822
{ 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 */
824825
{ },
825826
};
826827
MODULE_DEVICE_TABLE(hid, corsairpsu_idtable);

drivers/hwmon/pwm-fan.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,10 @@ static int pwm_fan_update_enable(struct pwm_fan_ctx *ctx, long val)
257257

258258
if (val == 0) {
259259
/* 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);
261264
if (ret)
262265
ctx->enable_mode = old_val;
263266
pwm_fan_update_state(ctx, 0);

0 commit comments

Comments
 (0)