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

[kvmfornfv.git] / kernel / drivers / media / platform / s5p-tv / mixer_drv.c

diff --git a/kernel/drivers/media/platform/s5p-tv/mixer_drv.c b/kernel/drivers/media/platform/s5p-tv/mixer_drv.c
index 2a9501d..5ef6777 100644 (file)
--- a/kernel/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/kernel/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -46,11 +46,15 @@ void mxr_get_mbus_fmt(struct mxr_device *mdev,
        struct v4l2_mbus_framefmt *mbus_fmt)
 {
        struct v4l2_subdev *sd;
+       struct v4l2_subdev_format fmt = {
+               .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+       };
        int ret;
 
        mutex_lock(&mdev->mutex);
        sd = to_outsd(mdev);
-       ret = v4l2_subdev_call(sd, video, g_mbus_fmt, mbus_fmt);
+       ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt);
+       *mbus_fmt = fmt.format;
        WARN(ret, "failed to get mbus_fmt for output %s\n", sd->name);
        mutex_unlock(&mdev->mutex);
 }
@@ -62,7 +66,10 @@ void mxr_streamer_get(struct mxr_device *mdev)
        mxr_dbg(mdev, "%s(%d)\n", __func__, mdev->n_streamer);
        if (mdev->n_streamer == 1) {
                struct v4l2_subdev *sd = to_outsd(mdev);
-               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 mxr_resources *res = &mdev->res;
                int ret;
 
@@ -72,12 +79,12 @@ void mxr_streamer_get(struct mxr_device *mdev)
                        clk_set_parent(res->sclk_mixer, res->sclk_hdmi);
                mxr_reg_s_output(mdev, to_output(mdev)->cookie);
 
-               ret = v4l2_subdev_call(sd, video, g_mbus_fmt, &mbus_fmt);
+               ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt);
                WARN(ret, "failed to get mbus_fmt for output %s\n", sd->name);
                ret = v4l2_subdev_call(sd, video, s_stream, 1);
                WARN(ret, "starting stream failed for output %s\n", sd->name);
 
-               mxr_reg_set_mbus_fmt(mdev, &mbus_fmt);
+               mxr_reg_set_mbus_fmt(mdev, mbus_fmt);
                mxr_reg_streamon(mdev);
                ret = mxr_reg_wait4vsync(mdev);
                WARN(ret, "failed to get vsync (%d) from output\n", ret);