Skip to content

Commit a96e902

Browse files
committed
Merge tag 'hwmon-for-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck: - Add missing lock protection in occ driver - Add missing comma in board name list in asus-ec-sensors driver - Fix devicetree bindings for ti,tmp401 * tag 'hwmon-for-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (asus-ec-sensors) add missing comma in board name list. hwmon: (occ) Lock mutex in shutdown to prevent race with occ_active dt-bindings: hwmon: ti,tmp401: Drop 'items' from 'ti,n-factor' property
2 parents 7c2d03f + ec41c6d commit a96e902

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Documentation/devicetree/bindings/hwmon/ti,tmp401.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ properties:
4040
value to be used for converting remote channel measurements to
4141
temperature.
4242
$ref: /schemas/types.yaml#/definitions/int32
43-
items:
44-
minimum: -128
45-
maximum: 127
43+
minimum: -128
44+
maximum: 127
4645

4746
ti,beta-compensation:
4847
description:

drivers/hwmon/asus-ec-sensors.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static const struct ec_board_info board_info[] = {
259259
},
260260
{
261261
.board_names = {
262-
"ROG CROSSHAIR VIII FORMULA"
262+
"ROG CROSSHAIR VIII FORMULA",
263263
"ROG CROSSHAIR VIII HERO",
264264
"ROG CROSSHAIR VIII HERO (WI-FI)",
265265
},

drivers/hwmon/occ/common.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,10 +1228,15 @@ EXPORT_SYMBOL_GPL(occ_setup);
12281228

12291229
void occ_shutdown(struct occ *occ)
12301230
{
1231+
mutex_lock(&occ->lock);
1232+
12311233
occ_shutdown_sysfs(occ);
12321234

12331235
if (occ->hwmon)
12341236
hwmon_device_unregister(occ->hwmon);
1237+
occ->hwmon = NULL;
1238+
1239+
mutex_unlock(&occ->lock);
12351240
}
12361241
EXPORT_SYMBOL_GPL(occ_shutdown);
12371242

0 commit comments

Comments
 (0)