> diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
> index af0b583..254d897 100644
> --- a/drivers/i2c/busses/i2c-davinci.c
> +++ b/drivers/i2c/busses/i2c-davinci.c
> @@ -372,9 +372,9 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
> flag |= DAVINCI_I2C_MDR_STP;
> davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag);
>
> - r = wait_for_completion_interruptible_timeout(&dev->cmd_complete,
> + r = wait_for_completion_timeout(&dev->cmd_complete,
> dev->adapter.timeout);
> - if (r == 0) {
> + if (unlikely(r == 0)) {
Not really needed, but well yeah...
> 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.
> }
>
> for (i = 0; i < num; i++) {
> ret = i2c_davinci_xfer_msg(adap, &msgs[i], (i == (num - 1)));
> - dev_dbg(dev->dev, "%s [%d/%d] ret: %d\n", __func__, i + 1, num,
> - ret);
> + dev_dbg(dev->dev, "%s [%d/%d] %#x ret: %d\n", __func__, i + 1,
> + num, msgs[i].addr, ret);
No need for this change. We have other debug output/tracing already. But
no need to clean up either.
> if (ret < 0)
> - return ret;
> + goto error;
> }
> + ret = num;
>
> +error:
> #ifdef CONFIG_CPU_FREQ
> complete(&dev->xfr_complete);
> #endif
>
> - return num;
> + return ret;
Thanks,
Wolfram
Attachment:
signature.asc
Description: Digital signature
