mei: fix device reset on mei_cl_irq_read_msg allocation failure

On memory allocation failure mei_cl_irq_read_msg will
return with error that will cause device reset.
Instead we should propagate error to caller and
just clean the read queues.

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

diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index be767f4..025626f 100644 (file)
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -322,10 +322,16 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length)
                goto out;
        }
 
+       if (cb->status) {
+               rets = cb->status;
+               goto free;
+       }
+
        r_length = min_t(size_t, length, cb->buf_idx);
        memcpy(buf, cb->response_buffer.data, r_length);
        rets = r_length;
 
+free:
        mei_io_cb_free(cb);
        cl->reading_state = MEI_IDLE;
        cl->read_cb = NULL;

diff --cc drivers/misc/mei/interrupt.c
Simple merge

diff --cc drivers/misc/mei/main.c
Simple merge

diff --cc drivers/misc/mei/mei_dev.h
Simple merge