Commit a96e902b authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-v5.19-rc3' of...

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
parents 7c2d03f1 ec41c6d8
...@@ -40,9 +40,8 @@ properties: ...@@ -40,9 +40,8 @@ properties:
value to be used for converting remote channel measurements to value to be used for converting remote channel measurements to
temperature. temperature.
$ref: /schemas/types.yaml#/definitions/int32 $ref: /schemas/types.yaml#/definitions/int32
items: minimum: -128
minimum: -128 maximum: 127
maximum: 127
ti,beta-compensation: ti,beta-compensation:
description: description:
......
...@@ -259,7 +259,7 @@ static const struct ec_board_info board_info[] = { ...@@ -259,7 +259,7 @@ static const struct ec_board_info board_info[] = {
}, },
{ {
.board_names = { .board_names = {
"ROG CROSSHAIR VIII FORMULA" "ROG CROSSHAIR VIII FORMULA",
"ROG CROSSHAIR VIII HERO", "ROG CROSSHAIR VIII HERO",
"ROG CROSSHAIR VIII HERO (WI-FI)", "ROG CROSSHAIR VIII HERO (WI-FI)",
}, },
......
...@@ -1228,10 +1228,15 @@ EXPORT_SYMBOL_GPL(occ_setup); ...@@ -1228,10 +1228,15 @@ EXPORT_SYMBOL_GPL(occ_setup);
void occ_shutdown(struct occ *occ) void occ_shutdown(struct occ *occ)
{ {
mutex_lock(&occ->lock);
occ_shutdown_sysfs(occ); occ_shutdown_sysfs(occ);
if (occ->hwmon) if (occ->hwmon)
hwmon_device_unregister(occ->hwmon); hwmon_device_unregister(occ->hwmon);
occ->hwmon = NULL;
mutex_unlock(&occ->lock);
} }
EXPORT_SYMBOL_GPL(occ_shutdown); EXPORT_SYMBOL_GPL(occ_shutdown);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment