Skip to content

Commit bd51613

Browse files
committed
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.
2 parents ef78e5b + 205447f commit bd51613

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/hwmon/pmbus/ltc2978.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ enum chips { ltc2974, ltc2975, ltc2977, ltc2978, ltc2980, ltc3880, ltc3882,
8282

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

85-
#define LTC_NOT_BUSY BIT(5)
86-
#define LTC_NOT_PENDING BIT(4)
85+
#define LTC_NOT_BUSY BIT(6)
86+
#define LTC_NOT_PENDING BIT(5)
8787

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

drivers/hwmon/pmbus/xdpe12284.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ static const struct i2c_device_id xdpe122_id[] = {
9494
MODULE_DEVICE_TABLE(i2c, xdpe122_id);
9595

9696
static const struct of_device_id __maybe_unused xdpe122_of_match[] = {
97-
{.compatible = "infineon, xdpe12254"},
98-
{.compatible = "infineon, xdpe12284"},
97+
{.compatible = "infineon,xdpe12254"},
98+
{.compatible = "infineon,xdpe12284"},
9999
{}
100100
};
101101
MODULE_DEVICE_TABLE(of, xdpe122_of_match);

0 commit comments

Comments
 (0)