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

[kvmfornfv.git] / kernel / include / media / v4l2-mediabus.h

diff --git a/kernel/include/media/v4l2-mediabus.h b/kernel/include/media/v4l2-mediabus.h
index 38d960d..34cc99e 100644 (file)
--- a/kernel/include/media/v4l2-mediabus.h
+++ b/kernel/include/media/v4l2-mediabus.h
@@ -65,7 +65,7 @@
                                         V4L2_MBUS_CSI2_CHANNEL_2 | V4L2_MBUS_CSI2_CHANNEL_3)
 
 /**
- * v4l2_mbus_type - media bus type
+ * enum v4l2_mbus_type - media bus type
  * @V4L2_MBUS_PARALLEL:        parallel interface with hsync and vsync
  * @V4L2_MBUS_BT656:   parallel interface with embedded synchronisation, can
  *                     also be used for BT.1120
@@ -78,7 +78,7 @@ enum v4l2_mbus_type {
 };
 
 /**
- * v4l2_mbus_config - media bus configuration
+ * struct v4l2_mbus_config - media bus configuration
  * @type:      in: interface type
  * @flags:     in / out: configuration flags, depending on @type
  */
@@ -96,6 +96,7 @@ static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt,
        pix_fmt->colorspace = mbus_fmt->colorspace;
        pix_fmt->ycbcr_enc = mbus_fmt->ycbcr_enc;
        pix_fmt->quantization = mbus_fmt->quantization;
+       pix_fmt->xfer_func = mbus_fmt->xfer_func;
 }
 
 static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt,
@@ -108,6 +109,7 @@ static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt,
        mbus_fmt->colorspace = pix_fmt->colorspace;
        mbus_fmt->ycbcr_enc = pix_fmt->ycbcr_enc;
        mbus_fmt->quantization = pix_fmt->quantization;
+       mbus_fmt->xfer_func = pix_fmt->xfer_func;
        mbus_fmt->code = code;
 }