diff options
author | Greg Kroah-Hartman | 2019-02-11 09:05:58 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-02-11 09:05:58 +0100 |
commit | 5c07488d996b6b2af609f351bf54c9909ed0fdf8 (patch) | |
tree | 62cc2522698d7383cdf4a4f450bde30bc45f1832 /drivers/misc/mei/client.c | |
parent | coresight: Use event attributes for sink selection (diff) | |
parent | Linux 5.0-rc6 (diff) | |
download | kernel-qcow2-linux-5c07488d996b6b2af609f351bf54c9909ed0fdf8.tar.gz kernel-qcow2-linux-5c07488d996b6b2af609f351bf54c9909ed0fdf8.tar.xz kernel-qcow2-linux-5c07488d996b6b2af609f351bf54c9909ed0fdf8.zip |
Merge 5.0-rc6 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/client.c')
-rw-r--r-- | drivers/misc/mei/client.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c index 1fc8ea0f519b..ca4c9cc218a2 100644 --- a/drivers/misc/mei/client.c +++ b/drivers/misc/mei/client.c @@ -401,8 +401,11 @@ static void mei_io_list_flush_cl(struct list_head *head, struct mei_cl_cb *cb, *next; list_for_each_entry_safe(cb, next, head, list) { - if (cl == cb->cl) + if (cl == cb->cl) { list_del_init(&cb->list); + if (cb->fop_type == MEI_FOP_READ) + mei_io_cb_free(cb); + } } } |