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

[kvmfornfv.git] / kernel / drivers / media / platform / davinci / vpfe_capture.c

diff --git a/kernel/drivers/media/platform/davinci/vpfe_capture.c b/kernel/drivers/media/platform/davinci/vpfe_capture.c
index ccfcf3f..7767e07 100644 (file)
--- a/kernel/drivers/media/platform/davinci/vpfe_capture.c
+++ b/kernel/drivers/media/platform/davinci/vpfe_capture.c
@@ -370,7 +370,7 @@ static int vpfe_config_ccdc_image_format(struct vpfe_device *vpfe_dev)
  * For a given standard, this functions sets up the default
  * pix format & crop values in the vpfe device and ccdc.  It first
  * starts with defaults based values from the standard table.
- * It then checks if sub device support g_mbus_fmt and then override the
+ * It then checks if sub device supports get_fmt and then override the
  * values based on that.Sets crop values to match with scan resolution
  * starting at 0,0. It calls vpfe_config_ccdc_image_format() set the
  * values in ccdc
@@ -379,7 +379,10 @@ static int vpfe_config_image_format(struct vpfe_device *vpfe_dev,
                                    v4l2_std_id std_id)
 {
        struct vpfe_subdev_info *sdinfo = vpfe_dev->current_subdev;
-       struct v4l2_mbus_framefmt mbus_fmt;
+       struct v4l2_subdev_format fmt = {
+               .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+       };
+       struct v4l2_mbus_framefmt *mbus_fmt = &fmt.format;
        struct v4l2_pix_format *pix = &vpfe_dev->fmt.fmt.pix;
        int i, ret = 0;
 
@@ -413,26 +416,26 @@ static int vpfe_config_image_format(struct vpfe_device *vpfe_dev,
                pix->field = V4L2_FIELD_INTERLACED;
                /* assume V4L2_PIX_FMT_UYVY as default */
                pix->pixelformat = V4L2_PIX_FMT_UYVY;
-               v4l2_fill_mbus_format(&mbus_fmt, pix,
+               v4l2_fill_mbus_format(mbus_fmt, pix,
                                MEDIA_BUS_FMT_YUYV10_2X10);
        } else {
                pix->field = V4L2_FIELD_NONE;
                /* assume V4L2_PIX_FMT_SBGGR8 */
                pix->pixelformat = V4L2_PIX_FMT_SBGGR8;
-               v4l2_fill_mbus_format(&mbus_fmt, pix,
+               v4l2_fill_mbus_format(mbus_fmt, pix,
                                MEDIA_BUS_FMT_SBGGR8_1X8);
        }
 
-       /* if sub device supports g_mbus_fmt, override the defaults */
+       /* if sub device supports get_fmt, override the defaults */
        ret = v4l2_device_call_until_err(&vpfe_dev->v4l2_dev,
-                       sdinfo->grp_id, video, g_mbus_fmt, &mbus_fmt);
+                       sdinfo->grp_id, pad, get_fmt, NULL, &fmt);
 
        if (ret && ret != -ENOIOCTLCMD) {
                v4l2_err(&vpfe_dev->v4l2_dev,
-                       "error in getting g_mbus_fmt from sub device\n");
+                       "error in getting get_fmt from sub device\n");
                return ret;
        }
-       v4l2_fill_pix_format(pix, &mbus_fmt);
+       v4l2_fill_pix_format(pix, mbus_fmt);
        pix->bytesperline = pix->width * 2;
        pix->sizeimage = pix->bytesperline * pix->height;