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

Commit 78349043 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc fix from Greg KH:
 "Here is a single commit, to fix a reported problem in the mei driver"

* tag 'char-misc-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  mei: set client's read_cb to NULL when flow control fails
parents 5580723f accb884b

drivers/misc/mei/client.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -666,7 +666,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)) {
@@ -678,6 +677,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);