diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-19 06:36:08 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-19 06:36:08 -0800 |
| commit | 0a191749ce19112f8f20675232b951dccd4ae00e (patch) | |
| tree | b81540374236beb22d50daaa856910257c0e6e2d /drivers/misc | |
| parent | c765a6dfad10b857e9681d7c4dec375ebe78db8a (diff) | |
| parent | accb884b32e82f943340688c9cd30290531e73e0 (diff) | |
| download | linux-0a191749ce19112f8f20675232b951dccd4ae00e.tar.gz | |
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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/client.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c index fdc255955341..2df0efab00a2 100644 --- a/drivers/misc/mei/client.c +++ b/drivers/misc/mei/client.c @@ -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); |