--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
-@@ -1054,7 +1054,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2
+@@ -1052,7 +1052,7 @@ static int i2c_pxa_do_xfer(struct pxa_i2
ret = i2c->msg_idx;
if (!timeout && i2c->msg_num) {
ret = I2C_RETRY;
}
-@@ -1124,7 +1124,7 @@ static int i2c_pxa_pio_set_master(struct
+@@ -1122,7 +1122,7 @@ static int i2c_pxa_pio_set_master(struct
if (timeout < 0) {
show_state(i2c);
dev_err(&i2c->adap.dev,
return I2C_RETRY;
}
-@@ -1168,7 +1168,7 @@ static int i2c_pxa_do_pio_xfer(struct px
+@@ -1166,7 +1166,7 @@ static int i2c_pxa_do_pio_xfer(struct px
out:
if (timeout == 0) {