| Message ID | 20191022005922.30239-1-nicoleotsuka@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: (ina3221) Fix read timeout issue | expand |
On Mon, Oct 21, 2019 at 05:59:22PM -0700, Nicolin Chen wrote: > After introducing "samples" to the calculation of wait time, the > driver might timeout at the regmap_field_read_poll_timeout call, > because the wait time could be longer than the 100000 usec limit > due to a large "samples" number. > > So this patch sets the timeout limit to 2 times of the wait time > in order to fix this issue. > > Fixes: 5c090abf945b ("hwmon: (ina3221) Add averaging mode support") > Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> Applied. Thanks, Guenter > --- > drivers/hwmon/ina3221.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c > index ef37479991be..f335d0cb0c77 100644 > --- a/drivers/hwmon/ina3221.c > +++ b/drivers/hwmon/ina3221.c > @@ -213,7 +213,7 @@ static inline int ina3221_wait_for_data(struct ina3221_data *ina) > > /* Polling the CVRF bit to make sure read data is ready */ > return regmap_field_read_poll_timeout(ina->fields[F_CVRF], > - cvrf, cvrf, wait, 100000); > + cvrf, cvrf, wait, wait * 2); > } > > static int ina3221_read_value(struct ina3221_data *ina, unsigned int reg,
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c index ef37479991be..f335d0cb0c77 100644 --- a/drivers/hwmon/ina3221.c +++ b/drivers/hwmon/ina3221.c @@ -213,7 +213,7 @@ static inline int ina3221_wait_for_data(struct ina3221_data *ina) /* Polling the CVRF bit to make sure read data is ready */ return regmap_field_read_poll_timeout(ina->fields[F_CVRF], - cvrf, cvrf, wait, 100000); + cvrf, cvrf, wait, wait * 2); } static int ina3221_read_value(struct ina3221_data *ina, unsigned int reg,
After introducing "samples" to the calculation of wait time, the driver might timeout at the regmap_field_read_poll_timeout call, because the wait time could be longer than the 100000 usec limit due to a large "samples" number. So this patch sets the timeout limit to 2 times of the wait time in order to fix this issue. Fixes: 5c090abf945b ("hwmon: (ina3221) Add averaging mode support") Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> --- drivers/hwmon/ina3221.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)