diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-01 11:10:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-01 11:10:25 -0800 |
| commit | e214dd935bf154af4c2d5013b16a283d592ccea5 (patch) | |
| tree | 775c3260b6524e0a110934506a3c6e3d3ca05ed2 /drivers/hwmon/ltc2947-core.c | |
| parent | 063c0e773ab33103407a76051821777014b756fe (diff) | |
| parent | 9bdc112be727cf1ba65be79541147f960c3349d8 (diff) | |
| download | linux-e214dd935bf154af4c2d5013b16a283d592ccea5.tar.gz | |
Merge tag 'hwmon-for-v6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- Fix refcount leak and NULL pointer access in coretemp driver
- Fix UAF in ibmpex driver
- Add missing pci_disable_device() to i5500_temp driver
- Fix calculation in ina3221 driver
- Fix temperature scaling in ltc2947 driver
- Check result of devm_kcalloc call in asus-ec-sensors driver
* tag 'hwmon-for-v6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (asus-ec-sensors) Add checks for devm_kcalloc
hwmon: (coretemp) fix pci device refcount leak in nv1a_ram_new()
hwmon: (coretemp) Check for null before removing sysfs attrs
hwmon: (ibmpex) Fix possible UAF when ibmpex_register_bmc() fails
hwmon: (i5500_temp) fix missing pci_disable_device()
hwmon: (ina3221) Fix shunt sum critical calculation
hwmon: (ltc2947) fix temperature scaling
Diffstat (limited to 'drivers/hwmon/ltc2947-core.c')
| -rw-r--r-- | drivers/hwmon/ltc2947-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/ltc2947-core.c b/drivers/hwmon/ltc2947-core.c index 7404e974762f..2dbbbac9de09 100644 --- a/drivers/hwmon/ltc2947-core.c +++ b/drivers/hwmon/ltc2947-core.c @@ -396,7 +396,7 @@ static int ltc2947_read_temp(struct device *dev, const u32 attr, long *val, return ret; /* in milidegrees celcius, temp is given by: */ - *val = (__val * 204) + 550; + *val = (__val * 204) + 5500; return 0; } |