mei: propagate error from write routines instead of ENODEV

ENODEV will cause application to try to reconnect since
it assumes that device went through the reset
write errors are not always fatal it can happen due to
resource contention

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index bccc3164ea4c..1a53d961302a 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -706,6 +706,7 @@ int mei_cl_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb,
         struct mei_msg_hdr mei_hdr;
         size_t len = cb->request_buffer.size - cb->buf_idx;
         u32 msg_slots = mei_data2slots(len);
+        int rets;
 
         mei_hdr.host_addr = cl->host_client_id;
         mei_hdr.me_addr = cl->me_client_id;
@@ -729,11 +730,12 @@ int mei_cl_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb,
                         cb->request_buffer.size, cb->buf_idx);
 
         *slots -=  msg_slots;
-        if (mei_write_message(dev, &mei_hdr,
-                        cb->request_buffer.data + cb->buf_idx)) {
-                cl->status = -ENODEV;
+        rets = mei_write_message(dev, &mei_hdr,
+                        cb->request_buffer.data + cb->buf_idx);
+        if (rets) {
+                cl->status = rets;
                 list_move_tail(&cb->list, &cmpl_list->list);
-                return -ENODEV;
+                return rets;
         }
 
         cl->status = 0;
@@ -742,7 +744,7 @@ int mei_cl_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb,
 
         if (mei_hdr.msg_complete) {
                 if (mei_cl_flow_ctrl_reduce(cl))
-                        return -ENODEV;
+                        return -EIO;
                 list_move_tail(&cb->list, &dev->write_waiting_list.list);
         }
 
@@ -811,10 +813,9 @@ int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking)
         mei_hdr.reserved = 0;
 
 
-        if (mei_write_message(dev, &mei_hdr, buf->data)) {
-                rets = -EIO;
+        rets = mei_write_message(dev, &mei_hdr, buf->data);
+        if (rets)
                 goto err;
-        }
 
         cl->writing_state = MEI_WRITING;
         cb->buf_idx = mei_hdr.length;