mei: always initialize the callback with the intended operation type

We set the operation type at initialization time as each cb is used only
for a single type of operation

As a byproduct we add a convenient wrapper for allocating cb with
the data buffer.

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

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 4f83e9aaa6f9..2c581dcaf3b1 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -684,10 +684,9 @@ static int mei_hbm_fw_disconnect_req(struct mei_device *dev,
                 cl->state = MEI_FILE_DISCONNECTED;
                 cl->timer_count = 0;
 
-                cb = mei_io_cb_init(cl, NULL);
+                cb = mei_io_cb_init(cl, MEI_FOP_DISCONNECT_RSP, NULL);
                 if (!cb)
                         return -ENOMEM;
-                cb->fop_type = MEI_FOP_DISCONNECT_RSP;
                 cl_dbg(dev, cl, "add disconnect response as first\n");
                 list_add(&cb->list, &dev->ctrl_wr_list.list);
         }