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

Commit 1eb5bd4d authored Jun 16, 2016 by Alexander Usyskin Committed by Greg Kroah-Hartman Aug 30, 2016

mei: drop read complete queue emptiness check



In the course of the read flow we want to wait for read completion only
if the read queue is empty.
However the calling list_empty(&cl->rd_completed) is a duplication as the
same check was performed by mei_cl_read_cb() and the waiting is skipped
if it returns not NULL.

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 041330d9

drivers/misc/mei/bus.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,8 @@ ssize_t __mei_cl_recv(struct mei_cl cl, u8 buf, size_t length)
		goto out;

		/* wait on event only if there is no other waiter */
		if (list_empty(&cl->rd_completed) && !waitqueue_active(&cl->rx_wait)) {
		/* synchronized under device mutex */
		if (!waitqueue_active(&cl->rx_wait)) {

		mutex_unlock(&bus->device_lock);

drivers/misc/mei/main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,8 @@ static ssize_t mei_read(struct file file, char __user ubuf,
		goto out;
		}

		if (list_empty(&cl->rd_completed) && !waitqueue_active(&cl->rx_wait)) {
		/* synchronized under device mutex */
		if (!waitqueue_active(&cl->rx_wait)) {
		if (file->f_flags & O_NONBLOCK) {
		rets = -EAGAIN;
		goto out;