1 files changed, 13 insertions, 36 deletions

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 053139f61086..5e11b5b9b65d 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -194,7 +194,6 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
         struct mei_cl_cb *cb_pos = NULL;
         struct mei_cl_cb *cb = NULL;
         struct mei_device *dev;
-        int i;
         int rets;
         int err;
 
@@ -210,38 +209,26 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
                 goto out;
         }
 
-        if ((cl->sm_state & MEI_WD_STATE_INDEPENDENCE_MSG_SENT) == 0) {
-                /* Do not allow to read watchdog client */
-                i = mei_me_cl_by_uuid(dev, &mei_wd_guid);
-                if (i >= 0) {
-                        struct mei_me_client *me_client = &dev->me_clients[i];
-                        if (cl->me_client_id == me_client->client_id) {
-                                rets = -EBADF;
-                                goto out;
-                        }
-                }
-        } else {
-                cl->sm_state &= ~MEI_WD_STATE_INDEPENDENCE_MSG_SENT;
-        }
-
         if (cl == &dev->iamthif_cl) {
                 rets = mei_amthif_read(dev, file, ubuf, length, offset);
                 goto out;
         }
 
-        if (cl->read_cb && cl->read_cb->buf_idx > *offset) {
-                cb = cl->read_cb;
-                goto copy_buffer;
-        } else if (cl->read_cb && cl->read_cb->buf_idx > 0 &&
-                   cl->read_cb->buf_idx <= *offset) {
+        if (cl->read_cb) {
                 cb = cl->read_cb;
-                rets = 0;
-                goto free;
-        } else if ((!cl->read_cb || !cl->read_cb->buf_idx) && *offset > 0) {
-                /*Offset needs to be cleaned for contiguous reads*/
+                /* read what left */
+                if (cb->buf_idx > *offset)
+                        goto copy_buffer;
+                /* offset is beyond buf_idx we have no more data return 0 */
+                if (cb->buf_idx > 0 && cb->buf_idx <= *offset) {
+                        rets = 0;
+                        goto free;
+                }
+                /* Offset needs to be cleaned for contiguous reads*/
+                if (cb->buf_idx == 0 && *offset > 0)
+                        *offset = 0;
+        } else if (*offset > 0) {
                 *offset = 0;
-                rets = 0;
-                goto out;
         }
 
         err = mei_cl_read_start(cl, length);
@@ -420,16 +407,6 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
         if (rets)
                 goto out;
 
-        cl->sm_state = 0;
-        if (length == 4 &&
-            ((memcmp(mei_wd_state_independence_msg[0],
-                                 write_cb->request_buffer.data, 4) == 0) ||
-             (memcmp(mei_wd_state_independence_msg[1],
-                                 write_cb->request_buffer.data, 4) == 0) ||
-             (memcmp(mei_wd_state_independence_msg[2],
-                                 write_cb->request_buffer.data, 4) == 0)))
-                cl->sm_state |= MEI_WD_STATE_INDEPENDENCE_MSG_SENT;
-
         if (cl == &dev->iamthif_cl) {
                 rets = mei_amthif_write(dev, write_cb);