Skip to content

Commit

Permalink
Merge tag 'hwmon-for-v6.13-rc1-take2' of git://git.kernel.org/pub/scm…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Nov 27, 2024
2 parents 750909d + 998b5a7 commit 727968f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/hwmon/aquacomputer_d5next.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
5 changes: 0 additions & 5 deletions drivers/hwmon/tmp108.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion drivers/hwmon/tps23861.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 727968f

Please sign in to comment.