diff options
| -rw-r--r-- | drivers/misc/eeprom/at24.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 04e91e331fc5..3cdf8e1ca0ad 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -116,7 +116,8 @@ MODULE_PARM_DESC(write_timeout, "Time (in ms) to try writes (default 25)");  /*   * Both reads and writes fail if the previous write didn't complete yet. This   * macro loops a few times waiting at least long enough for one entire page - * write to work. + * write to work while making sure that at least one iteration is run before + * checking the break condition.   *   * It takes two parameters: a variable in which the future timeout in jiffies   * will be stored and a temporary variable holding the time of the last @@ -124,9 +125,8 @@ MODULE_PARM_DESC(write_timeout, "Time (in ms) to try writes (default 25)");   * holding at least 32 bits.   */  #define loop_until_timeout(tout, op_time)				\ -	for (tout = jiffies + msecs_to_jiffies(write_timeout),		\ -		op_time = jiffies;					\ -	     time_before(op_time, tout);				\ +	for (tout = jiffies + msecs_to_jiffies(write_timeout), op_time = 0; \ +	     op_time ? time_before(op_time, tout) : true;		\  	     usleep_range(1000, 1500), op_time = jiffies)  static const struct i2c_device_id at24_ids[] = { | 
