mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 16:38:12 +00:00
hwmon fixes for v5.19-rc3
* 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 -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEiHPvMQj9QTOCiqgVyx8mb86fmYEFAmKsh2wACgkQyx8mb86f mYEuHxAAj7lbwk6oedTFsHu55sZ7jKZn0/i3wGVd6vv1fZewEU6jKhhClALTK0yh NwzBO7XaM5AO95o29FLOM1rZ3PTPIbfefnAWsyh68ZziDkkbtRCb/ySYGBhHQPwL eT3ab7b+Xc0tZURnLsrYXbA4zKe9+0IG0xOgkjM7YFEMLnrzt5ysB69Vi4jSS/ec n4a/z4lqHply5UvB2UKS4+GqznxEVtu70PhjUn0oI1qRlZHKrtvr9+IwOKWJ0jeI u/dK5lEZYvbeBHksOiuqzlJigWpQo8lgbKMrI4K0jXF1XmqJsycVKZCffi0yCODg SXA6ajpbN8e/v7r8aDvl9chvJZ7j05yXeU4Zggap9TTO9Va4FZfH2XnWwKXribNq 1/KtB31z+4EYxupgeaYbVil8kfvkBkCDsEkbTVBc4iitFoWYX5Wi1h7ymHO/HDhI Cjefj2xc9cW5J+RslR52JJvPxtu+sztSAkvjxwe5ahQxa9Fu8P2cZax8n6rwLexb mlTH00gHC6atx16N754ERr9q0eziWlnz/9HV3Lne3SM5y39XcGI8eOaP3sj7nfYl evakMXgq65eIZpL8P2vWX6OsEAc3OuKM1UuEhGUKawdSNyAuczoCJ6ntMOpla3Pj lBw3RE2Hs1K18NJ5B+oZ3qzPVddPWs5kU17usCO9ps7wTpM3z+E= =0ZUU -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
a96e902ba9
3 changed files with 8 additions and 4 deletions
|
@ -40,9 +40,8 @@ properties:
|
|||
value to be used for converting remote channel measurements to
|
||||
temperature.
|
||||
$ref: /schemas/types.yaml#/definitions/int32
|
||||
items:
|
||||
minimum: -128
|
||||
maximum: 127
|
||||
minimum: -128
|
||||
maximum: 127
|
||||
|
||||
ti,beta-compensation:
|
||||
description:
|
||||
|
|
|
@ -259,7 +259,7 @@ static const struct ec_board_info board_info[] = {
|
|||
},
|
||||
{
|
||||
.board_names = {
|
||||
"ROG CROSSHAIR VIII FORMULA"
|
||||
"ROG CROSSHAIR VIII FORMULA",
|
||||
"ROG CROSSHAIR VIII HERO",
|
||||
"ROG CROSSHAIR VIII HERO (WI-FI)",
|
||||
},
|
||||
|
|
|
@ -1228,10 +1228,15 @@ EXPORT_SYMBOL_GPL(occ_setup);
|
|||
|
||||
void occ_shutdown(struct occ *occ)
|
||||
{
|
||||
mutex_lock(&occ->lock);
|
||||
|
||||
occ_shutdown_sysfs(occ);
|
||||
|
||||
if (occ->hwmon)
|
||||
hwmon_device_unregister(occ->hwmon);
|
||||
occ->hwmon = NULL;
|
||||
|
||||
mutex_unlock(&occ->lock);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(occ_shutdown);
|
||||
|
||||
|
|
Loading…
Reference in a new issue