aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/i2c/busses/i2c-octeon.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
index 6e75e016bffc..32914ab42a19 100644
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon.c
@@ -200,7 +200,7 @@ static int octeon_i2c_test_iflg(struct octeon_i2c *i2c)
200 */ 200 */
201static int octeon_i2c_wait(struct octeon_i2c *i2c) 201static int octeon_i2c_wait(struct octeon_i2c *i2c)
202{ 202{
203 int result; 203 long result;
204 204
205 octeon_i2c_int_enable(i2c); 205 octeon_i2c_int_enable(i2c);
206 206
@@ -210,10 +210,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c)
210 210
211 octeon_i2c_int_disable(i2c); 211 octeon_i2c_int_disable(i2c);
212 212
213 if (result < 0) { 213 if (result == 0) {
214 dev_dbg(i2c->dev, "%s: wait interrupted\n", __func__);
215 return result;
216 } else if (result == 0) {
217 dev_dbg(i2c->dev, "%s: timeout\n", __func__); 214 dev_dbg(i2c->dev, "%s: timeout\n", __func__);
218 return -ETIMEDOUT; 215 return -ETIMEDOUT;
219 } 216 }