diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-11-04 05:32:04 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-11-04 05:32:04 -0500 |
| commit | ca8888d7ae6fa18454c9e4f192c56bc6c8ca9b33 (patch) | |
| tree | c2b86b162f8fc2adf8a98f7e074500bee155d603 /drivers/hwmon/ina3221.c | |
| parent | db616173d787395787ecc93eef075fa975227b10 (diff) | |
| parent | a99d8080aaf358d5d23581244e5da23b35e340b9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
to pick up the KVM fix which is required for the NX series.
Diffstat (limited to 'drivers/hwmon/ina3221.c')
| -rw-r--r-- | drivers/hwmon/ina3221.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c index 0037e2bdacd6..8a51dcf055ea 100644 --- a/drivers/hwmon/ina3221.c +++ b/drivers/hwmon/ina3221.c | |||
| @@ -170,7 +170,7 @@ static inline int ina3221_wait_for_data(struct ina3221_data *ina) | |||
| 170 | 170 | ||
| 171 | /* Polling the CVRF bit to make sure read data is ready */ | 171 | /* Polling the CVRF bit to make sure read data is ready */ |
| 172 | return regmap_field_read_poll_timeout(ina->fields[F_CVRF], | 172 | return regmap_field_read_poll_timeout(ina->fields[F_CVRF], |
| 173 | cvrf, cvrf, wait, 100000); | 173 | cvrf, cvrf, wait, wait * 2); |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | static int ina3221_read_value(struct ina3221_data *ina, unsigned int reg, | 176 | static int ina3221_read_value(struct ina3221_data *ina, unsigned int reg, |