These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / v4l2-core / videobuf-core.c

diff --git a/kernel/drivers/media/v4l2-core/videobuf-core.c b/kernel/drivers/media/v4l2-core/videobuf-core.c
index 926836d..6c02989 100644 (file)
--- a/kernel/drivers/media/v4l2-core/videobuf-core.c
+++ b/kernel/drivers/media/v4l2-core/videobuf-core.c
@@ -576,7 +576,8 @@ int videobuf_qbuf(struct videobuf_queue *q, struct v4l2_buffer *b)
                }
                if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT
                    || q->type == V4L2_BUF_TYPE_VBI_OUTPUT
-                   || q->type == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) {
+                   || q->type == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT
+                   || q->type == V4L2_BUF_TYPE_SDR_OUTPUT) {
                        buf->size = b->bytesused;
                        buf->field = b->field;
                        buf->ts = b->timestamp;
@@ -1154,6 +1155,7 @@ unsigned int videobuf_poll_stream(struct file *file,
                        case V4L2_BUF_TYPE_VIDEO_OUTPUT:
                        case V4L2_BUF_TYPE_VBI_OUTPUT:
                        case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
+                       case V4L2_BUF_TYPE_SDR_OUTPUT:
                                rc = POLLOUT | POLLWRNORM;
                                break;
                        default: