diff options
| author | ERIC TASHAKKOR <w36098@motorola.com> | 2014-05-14 16:43:36 +0000 |
|---|---|---|
| committer | ERIC TASHAKKOR <w36098@motorola.com> | 2014-05-14 16:44:01 +0000 |
| commit | 65fcccea0ee3987f0fef3047adde958e7cd62103 (patch) | |
| tree | 57143c5c9a07b5d35c505e7428b5133d32fbae79 | |
| parent | 041954ae4b8e9a68fa24972f09b38d65f0381a8c (diff) | |
| download | olio-linux-3.10-65fcccea0ee3987f0fef3047adde958e7cd62103.tar.xz olio-linux-3.10-65fcccea0ee3987f0fef3047adde958e7cd62103.zip | |
Revert "IKXCLOCK-1293 Reduce M4 I2C Bus Retry Delay"
This reverts commit 55cb2562f4736adacd258e90fb727b540b5a4c58.
Change-Id: Ia1ee7a54c3417c2116ad9092a7b615789256ab66
| -rw-r--r-- | drivers/mfd/m4sensorhub-reg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mfd/m4sensorhub-reg.c b/drivers/mfd/m4sensorhub-reg.c index b1f79679212..a03ecc71f14 100644 --- a/drivers/mfd/m4sensorhub-reg.c +++ b/drivers/mfd/m4sensorhub-reg.c @@ -25,8 +25,7 @@ #include "m4sensorhub-reg.h" /* auto-generated header defining registers */ -#define I2C_RETRY_DELAY_MIN 20 -#define I2C_RETRY_DELAY_MAX 50 +#define I2C_RETRY_DELAY 5 #define I2C_RETRIES 5 #define DEBUG_LINE_LENGTH 80 @@ -353,7 +352,7 @@ int m4sensorhub_i2c_write_read(struct m4sensorhub_data *m4sensorhub, err = i2c_transfer(m4sensorhub->i2c_client->adapter, &msgs[msgstart], msglen); if (err != msglen) - usleep_range(I2C_RETRY_DELAY_MIN, I2C_RETRY_DELAY_MAX); + msleep_interruptible(I2C_RETRY_DELAY); } while ((err != msglen) && (++tries < I2C_RETRIES)); if (err != msglen) { dev_err(&m4sensorhub->i2c_client->dev, "i2c transfer error; " |