From: Hans Verkuil Date: Sat, 16 Jul 2016 10:58:31 +0000 (-0300) Subject: [media] cec: CEC_RECEIVE overwrote the timeout field X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e883b4d02670ae83ab24e9af969de1af756959f8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git [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: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/cec/cec-api.c b/drivers/staging/media/cec/cec-api.c index 9151b1fa18dc..879f7d96e1a7 100644 --- a/drivers/staging/media/cec/cec-api.c +++ b/drivers/staging/media/cec/cec-api.c @@ -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; }