diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-22 14:58:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-22 14:58:57 -0800 |
| commit | c7756f3a327daa53a80ebcc9d9a54c562382ddb0 (patch) | |
| tree | b91ef3615d45186b63d6506961d434330f1abf6d /drivers/media/cec/core/cec-adap.c | |
| parent | 13e4ad2ce8df6e058ef482a31fdd81c725b0f7ea (diff) | |
| parent | 62456590b84965ad8d633dbd8f8c75fcf1e765d6 (diff) | |
Merge tag 'media/v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- fix VIDIOC_DQEVENT ioctl handling for 32-bit userspace with a 64-bit
kernel
- regression fix for videobuf2 core
- fix for CEC core when handling non-block transmit
- hi846: fix a clang warning
* tag 'media/v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: hi846: remove the of_match_ptr macro
media: hi846: include property.h instead of of_graph.h
media: cec: copy sequence field for the reply
media: videobuf2-dma-sg: Fix buf->vb NULL pointer dereference
media: v4l2-core: fix VIDIOC_DQEVENT handling on non-x86
Diffstat (limited to 'drivers/media/cec/core/cec-adap.c')
| -rw-r--r-- | drivers/media/cec/core/cec-adap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c index 79fa36de8a04..cd9cb354dc2c 100644 --- a/drivers/media/cec/core/cec-adap.c +++ b/drivers/media/cec/core/cec-adap.c @@ -1199,6 +1199,7 @@ void cec_received_msg_ts(struct cec_adapter *adap, if (abort) dst->rx_status |= CEC_RX_STATUS_FEATURE_ABORT; msg->flags = dst->flags; + msg->sequence = dst->sequence; /* Remove it from the wait_queue */ list_del_init(&data->list); |