mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
Merge branch 'char-misc-linus' into char-misc-next
We want the mei change here to allow future mei patches to apply properly. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
commit
0a191749ce
1 changed files with 3 additions and 1 deletions
|
@ -663,7 +663,6 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length)
|
|||
goto err;
|
||||
|
||||
cb->fop_type = MEI_FOP_READ;
|
||||
cl->read_cb = cb;
|
||||
if (dev->hbuf_is_ready) {
|
||||
dev->hbuf_is_ready = false;
|
||||
if (mei_hbm_cl_flow_control_req(dev, cl)) {
|
||||
|
@ -675,6 +674,9 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length)
|
|||
} else {
|
||||
list_add_tail(&cb->list, &dev->ctrl_wr_list.list);
|
||||
}
|
||||
|
||||
cl->read_cb = cb;
|
||||
|
||||
return rets;
|
||||
err:
|
||||
mei_io_cb_free(cb);
|
||||
|
|
Loading…
Reference in a new issue