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

Commit e883b4d0 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cec: CEC_RECEIVE overwrote the timeout field 



When CEC_RECEIVE returns a message the original timeout field
was overwritten. Restore the timeout field.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent e05b1872

drivers/staging/media/cec/cec-api.c

+3 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static long cec_transmit(struct cec_adapter *adap, struct cec_fh *fh, 
/* Called by CEC_RECEIVE: wait for a message to arrive */

static int cec_receive_msg(struct cec_fh *fh, struct cec_msg *msg, bool block)

{

	u32 timeout = msg->timeout;

	int res;



	do {
@@ -225,6 +226,8 @@ static int cec_receive_msg(struct cec_fh *fh, struct cec_msg *msg, bool block) 
			kfree(entry);

			fh->queued_msgs--;

			mutex_unlock(&fh->lock);

			/* restore original timeout value */

			msg->timeout = timeout;

			return 0;

		}