Commit a96e902b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

+2 −3
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ properties: 
      value to be used for converting remote channel measurements to

      temperature.

    $ref: /schemas/types.yaml#/definitions/int32

    items:

    minimum: -128

    maximum: 127

drivers/hwmon/asus-ec-sensors.c

+1 −1
Original line number Diff line number Diff line
@@ -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)",

		},

drivers/hwmon/occ/common.c

+5 −0
Original line number Diff line number Diff line
@@ -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);