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

Pull hwmon fixes from Guenter Roeck:

- acpi_power_meter: Fix 4.29 MW output seen if acpi reports bad data

- corsair-psu: Fix ability to probe if the driver is built into the kernel

- ltc2991: Fix spelling mistake "contiuous" -> "continuous"

- max31827: Add missing regulator header file include

- nzxt-kraken2: Fix error handling path in probe function

* tag 'hwmon-for-v6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (corsair-psu) Fix probe when built-in
hwmon: (nzxt-kraken2) Fix error handling path in kraken2_probe()
hwmon: (acpi_power_meter) Fix 4.29 MW bug
hwmon: max31827: include regulator header
hwmon: ltc2991: Fix spelling mistake "contiuous" -> "continuous"

Linus Torvalds 2 years ago 0dfe14fc d650b3be

+25 -4

5 changed files

expand all

drivers

hwmon

acpi_power_meter.c

corsair-psu.c

ltc2991.c

max31827.c

nzxt-kraken2.c

drivers/hwmon/acpi_power_meter.c

··· 31 31 #define POWER_METER_CAN_NOTIFY (1 << 3) 32 32 #define POWER_METER_IS_BATTERY (1 << 8) 33 33 #define UNKNOWN_HYSTERESIS 0xFFFFFFFF 34 + #define UNKNOWN_POWER 0xFFFFFFFF 34 35 35 36 #define METER_NOTIFY_CONFIG 0x80 36 37 #define METER_NOTIFY_TRIP 0x81 ··· 348 347 mutex_lock(&resource->lock); 349 348 update_meter(resource); 350 349 mutex_unlock(&resource->lock); 350 + 351 + if (resource->power == UNKNOWN_POWER) 352 + return -ENODATA; 351 353 352 354 return sprintf(buf, "%llu\n", resource->power * 1000); 353 355 }

+17 -1

drivers/hwmon/corsair-psu.c

··· 899 899 .reset_resume = corsairpsu_resume, 900 900 #endif 901 901 }; 902 - module_hid_driver(corsairpsu_driver); 902 + 903 + static int __init corsair_init(void) 904 + { 905 + return hid_register_driver(&corsairpsu_driver); 906 + } 907 + 908 + static void __exit corsair_exit(void) 909 + { 910 + hid_unregister_driver(&corsairpsu_driver); 911 + } 912 + 913 + /* 914 + * With module_init() the driver would load before the HID bus when 915 + * built-in, so use late_initcall() instead. 916 + */ 917 + late_initcall(corsair_init); 918 + module_exit(corsair_exit); 903 919 904 920 MODULE_LICENSE("GPL"); 905 921 MODULE_AUTHOR("Wilken Gottwalt <wilken.gottwalt@posteo.net>");

+1 -1

drivers/hwmon/ltc2991.c

··· 373 373 LTC2991_REPEAT_ACQ_EN); 374 374 if (ret) 375 375 return dev_err_probe(st->dev, ret, 376 - "Error: Failed to set contiuous mode.\n"); 376 + "Error: Failed to set continuous mode.\n"); 377 377 378 378 /* Enable all channels and trigger conversions */ 379 379 return regmap_write(st->regmap, LTC2991_CH_EN_TRIGGER,

drivers/hwmon/max31827.c

··· 12 12 #include <linux/i2c.h> 13 13 #include <linux/mutex.h> 14 14 #include <linux/regmap.h> 15 + #include <linux/regulator/consumer.h> 15 16 16 17 #define MAX31827_T_REG 0x0 17 18 #define MAX31827_CONFIGURATION_REG 0x2

+2 -2

drivers/hwmon/nzxt-kraken2.c

··· 161 161 ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW); 162 162 if (ret) { 163 163 hid_err(hdev, "hid hw start failed with %d\n", ret); 164 - goto fail_and_stop; 164 + return ret; 165 165 } 166 166 167 167 ret = hid_hw_open(hdev); 168 168 if (ret) { 169 169 hid_err(hdev, "hid hw open failed with %d\n", ret); 170 - goto fail_and_close; 170 + goto fail_and_stop; 171 171 } 172 172 173 173 priv->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "kraken2",

Configure Feed

Configure Feed