Skip to content

Commit 727968f

Browse files
committed
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
2 parents 750909d + 998b5a7 commit 727968f

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

drivers/hwmon/aquacomputer_d5next.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ struct aqc_data {
597597

598598
/* Sensor values */
599599
s32 temp_input[20]; /* Max 4 physical and 16 virtual or 8 physical and 12 virtual */
600-
s32 speed_input[8];
600+
s32 speed_input[9];
601601
u32 speed_input_min[1];
602602
u32 speed_input_target[1];
603603
u32 speed_input_max[1];

drivers/hwmon/tmp108.c

-5
Original file line numberDiff line numberDiff line change
@@ -452,12 +452,7 @@ static int p3t1085_i3c_probe(struct i3c_device *i3cdev)
452452
struct device *dev = i3cdev_to_dev(i3cdev);
453453
struct regmap *regmap;
454454

455-
#ifdef CONFIG_REGMAP_I3C
456455
regmap = devm_regmap_init_i3c(i3cdev, &tmp108_regmap_config);
457-
#else
458-
regmap = ERR_PTR(-ENODEV);
459-
#endif
460-
461456
if (IS_ERR(regmap))
462457
return dev_err_probe(dev, PTR_ERR(regmap),
463458
"Failed to register i3c regmap\n");

drivers/hwmon/tps23861.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static int tps23861_read_temp(struct tps23861_data *data, long *val)
132132
if (err < 0)
133133
return err;
134134

135-
*val = (regval * TEMPERATURE_LSB) - 20000;
135+
*val = ((long)regval * TEMPERATURE_LSB) - 20000;
136136

137137
return 0;
138138
}

0 commit comments

Comments
 (0)