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

[kvmfornfv.git] / kernel / drivers / media / usb / em28xx / em28xx-camera.c

diff --git a/kernel/drivers/media/usb/em28xx/em28xx-camera.c b/kernel/drivers/media/usb/em28xx/em28xx-camera.c
index a4b22c2..ed0b3a8 100644 (file)
--- a/kernel/drivers/media/usb/em28xx/em28xx-camera.c
+++ b/kernel/drivers/media/usb/em28xx/em28xx-camera.c
@@ -404,7 +404,9 @@ int em28xx_init_camera(struct em28xx *dev)
                        .addr = client->addr,
                        .platform_data = &camlink,
                };
-               struct v4l2_mbus_framefmt fmt;
+               struct v4l2_subdev_format format = {
+                       .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+               };
 
                /*
                 * FIXME: sensor supports resolutions up to 1600x1200, but
@@ -425,10 +427,10 @@ int em28xx_init_camera(struct em28xx *dev)
                        break;
                }
 
-               fmt.code = MEDIA_BUS_FMT_YUYV8_2X8;
-               fmt.width = 640;
-               fmt.height = 480;
-               v4l2_subdev_call(subdev, video, s_mbus_fmt, &fmt);
+               format.format.code = MEDIA_BUS_FMT_YUYV8_2X8;
+               format.format.width = 640;
+               format.format.height = 480;
+               v4l2_subdev_call(subdev, pad, set_fmt, NULL, &format);
 
                /* NOTE: for UXGA=1600x1200 switch to 12MHz */
                dev->board.xclk = EM28XX_XCLK_FREQUENCY_24MHZ;