| Message ID | 1403115247-8853-5-git-send-email-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 18 Jun 2014, Doug Anderson wrote: > From: Simon Glass <sjg@chromium.org> > > Some commands take a while to execute. Use -EAGAIN to signal this to the > caller. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Signed-off-by: Doug Anderson <dianders@chromium.org> > Acked-by: Lee Jones <lee.jones@linaro.org> > --- > Changes in v2: None > > drivers/mfd/cros_ec_spi.c | 6 ++++++ > 1 file changed, 6 insertions(+) Patch applied. 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/mfd/cros_ec_spi.c b/drivers/mfd/cros_ec_spi.c > index 52d4d7b..c29a2d7 100644 > --- a/drivers/mfd/cros_ec_spi.c > +++ b/drivers/mfd/cros_ec_spi.c > @@ -292,6 +292,12 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev, > /* check response error code */ > ptr = ec_dev->din; > if (ptr[0]) { > + if (ptr[0] == EC_RES_IN_PROGRESS) { > + dev_dbg(ec_dev->dev, "command 0x%02x in progress\n", > + ec_msg->cmd); > + ret = -EAGAIN; > + goto exit; > + } > dev_warn(ec_dev->dev, "command 0x%02x returned an error %d\n", > ec_msg->cmd, ptr[0]); > debug_packet(ec_dev->dev, "in_err", ptr, len);
diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/mfd/cros_ec_spi.c index 52d4d7b..c29a2d7 100644 --- a/drivers/mfd/cros_ec_spi.c +++ b/drivers/mfd/cros_ec_spi.c @@ -292,6 +292,12 @@ static int cros_ec_cmd_xfer_spi(struct cros_ec_device *ec_dev, /* check response error code */ ptr = ec_dev->din; if (ptr[0]) { + if (ptr[0] == EC_RES_IN_PROGRESS) { + dev_dbg(ec_dev->dev, "command 0x%02x in progress\n", + ec_msg->cmd); + ret = -EAGAIN; + goto exit; + } dev_warn(ec_dev->dev, "command 0x%02x returned an error %d\n", ec_msg->cmd, ptr[0]); debug_packet(ec_dev->dev, "in_err", ptr, len);