diff options
authorHans Verkuil <hans.verkuil@cisco.com>2016-07-16 09:59:18 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-19 13:24:09 -0300
commit4eef404fd91543dc82be2bd05d3b29919ec6c0e6 (patch)
parent40df3a7e586df59190547fe0e7d9928da735eada (diff)
[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>
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/media/cec/cec-api.c b/drivers/staging/media/cec/cec-api.c
index 879f7d96e1a7..559f6500d114 100644
--- a/drivers/staging/media/cec/cec-api.c
+++ b/drivers/staging/media/cec/cec-api.c
@@ -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;
- 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);
- }
if (err)
return err;

Privacy Policy