On Wed, 18 Jun 2014, Doug Anderson wrote:
> From: Bill Richardson <wfric...@chromium.org>
>
> When communicating with the EC, the cmd_xfer() function should return the
> number of bytes it received from the EC, or negative on error.
>
> Signed-off-by: Bill Richardson <wfric...@chromium.org>
> Signed-off-by: Doug Anderson <diand...@chromium.org>
> Acked-by: Lee Jones <lee.jo...@linaro.org>
> Reviewed-by: Simon Glass <s...@chromium.org>
> ---
> Changes in v2: None
>
> drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +-
> drivers/mfd/cros_ec_i2c.c | 2 +-
> drivers/mfd/cros_ec_spi.c | 2 +-
> include/linux/mfd/cros_ec.h | 8 ++++----
> 4 files changed, 7 insertions(+), 7 deletions(-)
Patch applied with Wolfram's Ack.
Clause: There is a chance that this patch might not be seen in -next
for ~24-48hrs. If it's not there by 72hrs, feel free to poke.
> diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c
> b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
> index dd07818..05e033c 100644
> --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c
> +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c
> @@ -228,7 +228,7 @@ static int ec_i2c_xfer(struct i2c_adapter *adap, struct
> i2c_msg i2c_msgs[],
> msg.insize = response_len;
>
> result = bus->ec->cmd_xfer(bus->ec, &msg);
> - if (result)
> + if (result < 0)
> goto exit;
>
> result = ec_i2c_parse_response(response, i2c_msgs, &num);
> diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/mfd/cros_ec_i2c.c
> index 189e7d1..fd7a546 100644
> --- a/drivers/mfd/cros_ec_i2c.c
> +++ b/drivers/mfd/cros_ec_i2c.c
> @@ -111,7 +111,7 @@ static int cros_ec_cmd_xfer_i2c(struct cros_ec_device
> *ec_dev,
> goto done;
> }
>
> - ret = 0;
> + ret = i2c_msg[1].buf[1];
> done:
> kfree(in_buf);
> kfree(out_buf);
> diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/mfd/cros_ec_spi.c
> index c975087..2ad6815 100644
> --- a/drivers/mfd/cros_ec_spi.c
> +++ b/drivers/mfd/cros_ec_spi.c
> @@ -324,7 +324,7 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device
> *ec_dev,
> goto exit;
> }
>
> - ret = 0;
> + ret = len;
> exit:
> mutex_unlock(&ec_spi->lock);
> return ret;
> diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h
> index 1f79f16..0ebf26f 100644
> --- a/include/linux/mfd/cros_ec.h
> +++ b/include/linux/mfd/cros_ec.h
> @@ -41,7 +41,7 @@ enum {
> * @outdata: Outgoing data to EC
> * @outsize: Outgoing length in bytes
> * @indata: Where to put the incoming data from EC
> - * @insize: Incoming length in bytes (filled in by EC)
> + * @insize: Max number of bytes to accept from EC
> * @result: EC's response to the command (separate from communication
> failure)
> */
> struct cros_ec_command {
> @@ -64,9 +64,9 @@ struct cros_ec_command {
> * sleep at the last suspend
> * @event_notifier: interrupt event notifier for transport devices
> * @cmd_xfer: send command to EC and get response
> - * Returns 0 if the communication succeeded, but that doesn't mean the EC
> - * was happy with the command it got. Caller should check msg.result for
> - * the EC's result code.
> + * Returns the number of bytes received if the communication succeeded,
> but
> + * that doesn't mean the EC was happy with the command. The caller
> + * should check msg.result for the EC's result code.
> *
> * @priv: Private data
> * @irq: Interrupt to use
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
