mei: do not override a client writing state when buffering
authorTomas Winkler <tomas.winkler@intel.com>
Sun, 23 Jun 2013 06:37:00 +0000 (09:37 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jun 2013 23:32:30 +0000 (16:32 -0700)
when we buffer write request we should not switch to
MEI_WRITING since this will override MEI_WRITE_COMPLETE
state of preceding write

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mei/client.c

index 788f647..11a465a 100644 (file)
@@ -731,7 +731,9 @@ int mei_cl_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb,
        }
 
        cl->status = 0;
+       cl->writing_state = MEI_WRITING;
        cb->buf_idx += mei_hdr.length;
+
        if (mei_hdr.msg_complete) {
                if (mei_cl_flow_ctrl_reduce(cl))
                        return -ENODEV;
@@ -783,7 +785,6 @@ int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking)
                cb->buf_idx = 0;
                /* unseting complete will enqueue the cb for write */
                mei_hdr.msg_complete = 0;
-               cl->writing_state = MEI_WRITING;
                rets = buf->size;
                goto out;
        }