Commit bd516133 authored Feb 15, 2020 by Linus Torvalds

Merge tag 'hwmon-for-v5.6-rc2' of...

Merge tag 'hwmon-for-v5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Fix compatible string typos in the xdpe12284 driver, and a wrong bit
  value in the ltc2978 driver"

* tag 'hwmon-for-v5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (pmbus/xdpe12284) fix typo in compatible strings
  hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions.

parents ef78e5b7 205447fa

drivers/hwmon/pmbus/ltc2978.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -82,8 +82,8 @@ enum chips { ltc2974, ltc2975, ltc2977, ltc2978, ltc2980, ltc3880, ltc3882,

		#define LTC_POLL_TIMEOUT 100 /* in milli-seconds */

		#define LTC_NOT_BUSY BIT(5)
		#define LTC_NOT_PENDING BIT(4)
		#define LTC_NOT_BUSY BIT(6)
		#define LTC_NOT_PENDING BIT(5)

		/*
		* LTC2978 clears peak data whenever the CLEAR_FAULTS command is executed, which

drivers/hwmon/pmbus/xdpe12284.c

+2 −2

File changed.

Contains only whitespace changes.

Admin message