Merge branch 'patchwork' into v4l_for_linus

* patchwork: (404 commits)
  [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
  [media] uvcvideo: fix cropcap v4l2-compliance failure
  [media] media: omap3isp: remove unused clkdev
  [media] coda: Add tracing support
  [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
  [media] coda: fix fill bitstream errors in nonstreaming case
  [media] coda: call SEQ_END when the first queue is stopped
  [media] coda: fail to start streaming if userspace set invalid formats
  [media] coda: remove duplicate error messages for buffer allocations
  [media] coda: move parameter buffer in together with context buffer allocation
  [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
  [media] coda: allocate per-context buffers from REQBUFS
  [media] coda: use strlcpy instead of snprintf
  [media] coda: bitstream payload is unsigned
  [media] coda: fix double call to debugfs_remove
  [media] coda: check kasprintf return value in coda_open
  [media] coda: bitrate can only be set in kbps steps
  [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
  [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
  [media] coda: set allow_zero_bytesused flag for vb2_queue_init
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 7c215ee142c4..b5a37fe10a6a 100644
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -1119,7 +1119,7 @@ static void set_rgb_quantization_range(struct v4l2_subdev *sd)
                 /* Receiving DVI-D signal
                  * ADV7842 selects RGB limited range regardless of
                  * input format (CE/IT) in automatic mode */
-                if (state->timings.bt.standards & V4L2_DV_BT_STD_CEA861) {
+                if (state->timings.bt.flags & V4L2_DV_FL_IS_CE_VIDEO) {
                         /* RGB limited range (16-235) */
                         io_write_and_or(sd, 0x02, 0x0f, 0x00);
                 } else {
@@ -1901,7 +1901,8 @@ static int adv7842_g_mbus_fmt(struct v4l2_subdev *sd,
                 return 0;
         }
 
-        if (state->timings.bt.standards & V4L2_DV_BT_STD_CEA861) {
+        fmt->colorspace = V4L2_COLORSPACE_SRGB;
+        if (state->timings.bt.flags & V4L2_DV_FL_IS_CE_VIDEO) {
                 fmt->colorspace = (state->timings.bt.height <= 576) ?
                         V4L2_COLORSPACE_SMPTE170M : V4L2_COLORSPACE_REC709;
         }