summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-06-07 20:44:05 +0200
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-06-26 01:26:16 +0200
commitcde0fe2acd7cf6f76e926d4e2ce14439681fd5be (patch)
tree69524dbc563c263ab8349382d708c02baebb6342 /drivers/rtc
parentd6faca40f40b62aca8ea8c29289c7bf7456172bb (diff)
downloadlinux-cde0fe2acd7cf6f76e926d4e2ce14439681fd5be.tar.bz2
rtc: rv8803: broaden workaround
The previous workaround may still fail as there are actually 4 retries to be done to ensure the communication succeed. Also, some I2C adapter drivers may return -EIO instead of -ENXIO. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-rv8803.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index f623038e586e..022ef26bef47 100644
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -68,7 +68,7 @@ static irqreturn_t rv8803_handle_irq(int irq, void *dev_id)
do {
flags = i2c_smbus_read_byte_data(client, RV8803_FLAG);
try++;
- } while ((flags == -ENXIO) && (try < 3));
+ } while (((flags == -ENXIO) || (flags == -EIO)) && (try < 4));
if (flags <= 0) {
mutex_unlock(&rv8803->flags_lock);
return IRQ_NONE;
@@ -452,7 +452,7 @@ static int rv8803_probe(struct i2c_client *client,
do {
flags = i2c_smbus_read_byte_data(client, RV8803_FLAG);
try++;
- } while ((flags == -ENXIO) && (try < 3));
+ } while (((flags == -ENXIO) || (flags == -EIO)) && (try < 4));
if (flags < 0)
return flags;
@@ -493,7 +493,7 @@ static int rv8803_probe(struct i2c_client *client,
err = i2c_smbus_write_byte_data(rv8803->client, RV8803_EXT,
RV8803_EXT_WADA);
try++;
- } while ((err == -ENXIO) && (try < 3));
+ } while (((err == -ENXIO) || (flags == -EIO)) && (try < 4));
if (err)
return err;