On Mon, Jun 15, 2015 at 9:19 PM, Vaibhav Hiremath <vaibhav.hiremath@xxxxxxxxxx> wrote: > From: Shouming Wang <wangshm@xxxxxxxxxxx> > > In case of timeout in pio mode of operation return I2C_RETRY. > This behavior will be same as interrupt mode of operation. > > Signed-off-by: Shouming Wang <wangshm@xxxxxxxxxxx> > [vaibhav.hiremath@xxxxxxxxxx: Updated changelog] > Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@xxxxxxxxxx> > --- > drivers/i2c/busses/i2c-pxa.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c > index 023e59f..632008f 100644 > --- a/drivers/i2c/busses/i2c-pxa.c > +++ b/drivers/i2c/busses/i2c-pxa.c > @@ -745,8 +745,10 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c, > ret = i2c->msg_idx; > > out: > - if (timeout == 0) > + if (timeout == 0) { > i2c_pxa_scream_blue_murder(i2c, "timeout"); > + ret = I2C_RETRY; Can we use standard return types. > + } > > return ret; > } > -- > 1.9.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html