2 files changed, 41 insertions, 23 deletions

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 392203d8d254..96db3ad21259 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -255,14 +255,15 @@ out:
 }
 
 /**
- * mei_amthif_write - write amthif data to amthif client
+ * mei_amthif_send_cmd - send amthif command to the ME
  *
  * @dev: the device structure
  * @cb: mei call back struct
  *
  * returns 0 on success, <0 on failure.
+ *
  */
-int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *cb)
+static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb)
 {
         struct mei_msg_hdr mei_hdr;
         int ret;
@@ -329,6 +330,38 @@ int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *cb)
 }
 
 /**
+ * mei_amthif_write - write amthif data to amthif client
+ *
+ * @dev: the device structure
+ * @cb: mei call back struct
+ *
+ * returns 0 on success, <0 on failure.
+ *
+ */
+int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *cb)
+{
+        int ret;
+
+        if (!dev || !cb)
+                return -ENODEV;
+
+        ret = mei_io_cb_alloc_resp_buf(cb, dev->iamthif_mtu);
+        if (ret)
+                return ret;
+
+        cb->major_file_operations = MEI_IOCTL;
+
+        if (!list_empty(&dev->amthi_cmd_list.list) ||
+            dev->iamthif_state != MEI_IAMTHIF_IDLE) {
+                dev_dbg(&dev->pdev->dev,
+                        "amthif state = %d\n", dev->iamthif_state);
+                dev_dbg(&dev->pdev->dev, "AMTHIF: add cb to the wait list\n");
+                list_add_tail(&cb->list, &dev->amthi_cmd_list.list);
+                return 0;
+        }
+        return mei_amthif_send_cmd(dev, cb);
+}
+/**
  * mei_amthif_run_next_cmd
  *
  * @dev: the device structure
@@ -360,7 +393,7 @@ void mei_amthif_run_next_cmd(struct mei_device *dev)
                 cl_tmp = (struct mei_cl *)pos->file_private;
 
                 if (cl_tmp && cl_tmp == &dev->iamthif_cl) {
-                        status = mei_amthif_write(dev, pos);
+                        status = mei_amthif_send_cmd(dev, pos);
                         if (status) {
                                 dev_dbg(&dev->pdev->dev,
                                         "amthi write failed status = %d\n",
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index d8221a5a7ee8..ff50cc14cc39 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -620,27 +620,12 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
                 cl->sm_state |= MEI_WD_STATE_INDEPENDENCE_MSG_SENT;
 
         if (cl == &dev->iamthif_cl) {
-                rets = mei_io_cb_alloc_resp_buf(write_cb, dev->iamthif_mtu);
-                if (rets)
-                        goto err;
+                rets = mei_amthif_write(dev, write_cb);
 
-                write_cb->major_file_operations = MEI_IOCTL;
-
-                if (!list_empty(&dev->amthi_cmd_list.list) ||
-                                dev->iamthif_state != MEI_IAMTHIF_IDLE) {
-                        dev_dbg(&dev->pdev->dev, "amthi_state = %d\n",
-                                        (int) dev->iamthif_state);
-                        dev_dbg(&dev->pdev->dev, "add amthi cb to amthi cmd waiting list\n");
-                        list_add_tail(&write_cb->list, &dev->amthi_cmd_list.list);
-                } else {
-                        dev_dbg(&dev->pdev->dev, "call amthi write\n");
-                        rets = mei_amthif_write(dev, write_cb);
-
-                        if (rets) {
-                                dev_err(&dev->pdev->dev, "amthi write failed with status = %d\n",
-                                    rets);
-                                goto err;
-                        }
+                if (rets) {
+                        dev_err(&dev->pdev->dev,
+                                "amthi write failed with status = %d\n", rets);
+                        goto err;
                 }
                 mutex_unlock(&dev->device_lock);
                 return length;