diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-19 09:51:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-19 09:51:01 -0700 |
| commit | bd4a1567b6e3454eda1113ed3a537119208e9c7a (patch) | |
| tree | 1c90d19ae9654e2ea21b213a3504d0973316147e /Documentation | |
| parent | acc0bac1c625972f3622339080194061e28fa243 (diff) | |
| parent | ce3cf7c8a17478456f502cb2facd6660e519ead3 (diff) | |
Merge tag 'hwmon-for-v6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- corsair-cpro: Validate the size of the received input buffer
- ina238: Report energy in microjoules as expected by the ABI
- pmbus/ucd9000: Fixed GPIO functionality
* tag 'hwmon-for-v6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (pmbus/ucd9000) Fix error in ucd9000_gpio_set
hwmon: (ina238) Report energy in microjoules
hwmon: (corsair-cpro) Validate the size of the received input buffer
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/ina238.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/ina238.rst b/Documentation/hwmon/ina238.rst index d1b93cf8627f..9a24da4786a4 100644 --- a/Documentation/hwmon/ina238.rst +++ b/Documentation/hwmon/ina238.rst @@ -65,7 +65,7 @@ Additional sysfs entries for sq52206 ------------------------------------ ======================= ======================================================= -energy1_input Energy measurement (mJ) +energy1_input Energy measurement (uJ) power1_input_highest Peak Power (uW) ======================= ======================================================= |