evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] cec: CEC_RECEIVE overwrote the timeout field

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

Change-Id: Ida65e37e1424745e3e4cf9d0108e10dc75e642ed
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Git-commit: e883b4d02670ae83ab24e9af969de1af756959f8
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
This commit is contained in:
Hans Verkuil 2016-07-16 07:58:31 -03:00 • committed by Ray Zhang
parent b58d42ad60
commit a743a520d1
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/media/cec/cec-api.c
View file

@ -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 */ /* 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) static int cec_receive_msg(struct cec_fh *fh, struct cec_msg *msg, bool block)
{ {
u32 timeout = msg->timeout;
int res; int res;
do { do {
@ -225,6 +226,8 @@ static int cec_receive_msg(struct cec_fh *fh, struct cec_msg *msg, bool block)
kfree(entry); kfree(entry);
fh->queued_msgs--; fh->queued_msgs--;
mutex_unlock(&fh->lock); mutex_unlock(&fh->lock);
/* restore original timeout value */
msg->timeout = timeout;
return 0; return 0;
} }