openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] cec: don't set fh to NULL in CEC_TRANSMIT 

The filehandle was set to NULL when in non-blocking mode or when
no reply is needed.

This is wrong: the filehandle is needed in non-blocking mode to ensure
that the result of the transmit can be obtained through CEC_RECEIVE.

And the 'reply' check was also incorrect since it should have checked the
timeout field (the reply can be 0). In any case, when in blocking mode
there is no need to set the fh to NULL either.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Hans Verkuil 2016-07-16 09:59:18 -03:00 committed by Mauro Carvalho Chehab
parent 40df3a7e58
commit 4eef404fd9
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/media/cec/cec-api.c
View File

@ -189,15 +189,12 @@ static long cec_transmit(struct cec_adapter *adap, struct cec_fh *fh,
if (copy_from_user(&msg, parg, sizeof(msg)))
return -EFAULT;
mutex_lock(&adap->lock);
if (!adap->is_configured) {
if (!adap->is_configured)
err = -ENONET;
} else if (cec_is_busy(adap, fh)) {
else if (cec_is_busy(adap, fh))
err = -EBUSY;
} else {
if (!block || !msg.reply)
fh = NULL;
else
err = cec_transmit_msg_fh(adap, &msg, fh, block);
}
mutex_unlock(&adap->lock);
if (err)
return err;