Commit d47136c2 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-v6.1-rc2' of...

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
parents cda5d920 5619c660
...@@ -19,6 +19,8 @@ Supported devices: ...@@ -19,6 +19,8 @@ Supported devices:
Corsair HX1200i Corsair HX1200i
Corsair HX1500i
Corsair RM550i Corsair RM550i
Corsair RM650i Corsair RM650i
......
...@@ -820,7 +820,8 @@ static const struct hid_device_id corsairpsu_idtable[] = { ...@@ -820,7 +820,8 @@ static const struct hid_device_id corsairpsu_idtable[] = {
{ HID_USB_DEVICE(0x1b1c, 0x1c0b) }, /* Corsair RM750i */ { HID_USB_DEVICE(0x1b1c, 0x1c0b) }, /* Corsair RM750i */
{ HID_USB_DEVICE(0x1b1c, 0x1c0c) }, /* Corsair RM850i */ { HID_USB_DEVICE(0x1b1c, 0x1c0c) }, /* Corsair RM850i */
{ HID_USB_DEVICE(0x1b1c, 0x1c0d) }, /* Corsair RM1000i */ { HID_USB_DEVICE(0x1b1c, 0x1c0d) }, /* Corsair RM1000i */
{ HID_USB_DEVICE(0x1b1c, 0x1c1e) }, /* Corsaur HX1000i revision 2 */ { HID_USB_DEVICE(0x1b1c, 0x1c1e) }, /* Corsair HX1000i revision 2 */
{ HID_USB_DEVICE(0x1b1c, 0x1c1f) }, /* Corsair HX1500i */
{ }, { },
}; };
MODULE_DEVICE_TABLE(hid, corsairpsu_idtable); MODULE_DEVICE_TABLE(hid, corsairpsu_idtable);
......
...@@ -257,7 +257,10 @@ static int pwm_fan_update_enable(struct pwm_fan_ctx *ctx, long val) ...@@ -257,7 +257,10 @@ static int pwm_fan_update_enable(struct pwm_fan_ctx *ctx, long val)
if (val == 0) { if (val == 0) {
/* Disable pwm-fan unconditionally */ /* Disable pwm-fan unconditionally */
ret = __set_pwm(ctx, 0); if (ctx->enabled)
ret = __set_pwm(ctx, 0);
else
ret = pwm_fan_switch_power(ctx, false);
if (ret) if (ret)
ctx->enable_mode = old_val; ctx->enable_mode = old_val;
pwm_fan_update_state(ctx, 0); pwm_fan_update_state(ctx, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment