Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a191749 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents c765a6df accb884b

drivers/misc/mei/client.c

+3 −1
Original line number Diff line number Diff line
@@ -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);