Merge tag 'hwmon-for-v6.13-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - aquacomputer_d5next: Fix length of speed_input array

 - tps23861: Fix reporting of negative temperatures

 - tmp108: Do not fail in I3C probe when I3C regmap is a module

* tag 'hwmon-for-v6.13-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (aquacomputer_d5next) Fix length of speed_input array
  hwmon: (tps23861) Fix reporting of negative temperatures
  hwmon: (tmp108) Do not fail in I3C probe when I3C regmap is a module
This commit is contained in:
Linus Torvalds
2024-11-26 18:28:11 -08:00
3 changed files with 2 additions and 7 deletions
+1 -1
View File
@@ -597,7 +597,7 @@ struct aqc_data {
/* Sensor values */
s32 temp_input[20]; /* Max 4 physical and 16 virtual or 8 physical and 12 virtual */
s32 speed_input[8];
s32 speed_input[9];
u32 speed_input_min[1];
u32 speed_input_target[1];
u32 speed_input_max[1];
-5
View File
@@ -452,12 +452,7 @@ static int p3t1085_i3c_probe(struct i3c_device *i3cdev)
struct device *dev = i3cdev_to_dev(i3cdev);
struct regmap *regmap;
#ifdef CONFIG_REGMAP_I3C
regmap = devm_regmap_init_i3c(i3cdev, &tmp108_regmap_config);
#else
regmap = ERR_PTR(-ENODEV);
#endif
if (IS_ERR(regmap))
return dev_err_probe(dev, PTR_ERR(regmap),
"Failed to register i3c regmap\n");
+1 -1
View File
@@ -132,7 +132,7 @@ static int tps23861_read_temp(struct tps23861_data *data, long *val)
if (err < 0)
return err;
*val = (regval * TEMPERATURE_LSB) - 20000;
*val = ((long)regval * TEMPERATURE_LSB) - 20000;
return 0;
}