> > dev_err(dev->dev, "controller timed out\n"); > > davinci_i2c_recover_bus(dev); > > i2c_davinci_init(dev); > > @@ -384,7 +384,6 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) > > if (dev->buf_len) { > > /* This should be 0 if all bytes were transferred > > * or dev->cmd_err denotes an error. > > - * A signal may have aborted the transfer. > > */ > > if (r >= 0) { > > dev_err(dev->dev, "abnormal termination buf_len=%i\n", > > @@ -436,22 +435,24 @@ i2c_davinci_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) > > ret = i2c_davinci_wait_bus_not_busy(dev, 1); > > if (ret < 0) { > > dev_warn(dev->dev, "timeout waiting for bus ready\n"); > > - return ret; > > + goto error; > > You are fixing the error path here to include the completion? This is a > seperate patch IMO. Is my remark true? I still prefer the seperate patch, but we may also simply update the commit message.
Attachment:
signature.asc
Description: Digital signature