UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Greg Kroah-Hartman 2014-02-19 06:36:08 -08:00
parent c765a6dfad accb884b32
commit 0a191749ce
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/mei/client.c
View File

@ -663,7 +663,6 @@ int mei_cl_read_start(struct mei_cl *cl, size_t length)
goto err; goto err;
cb->fop_type = MEI_FOP_READ; cb->fop_type = MEI_FOP_READ;
cl->read_cb = cb;
if (dev->hbuf_is_ready) { if (dev->hbuf_is_ready) {
dev->hbuf_is_ready = false; dev->hbuf_is_ready = false;
if (mei_hbm_cl_flow_control_req(dev, cl)) { 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 { } else {
list_add_tail(&cb->list, &dev->ctrl_wr_list.list); list_add_tail(&cb->list, &dev->ctrl_wr_list.list);
} }
cl->read_cb = cb;
return rets; return rets;
err: err:
mei_io_cb_free(cb); mei_io_cb_free(cb);