1 files changed, 13 insertions, 28 deletions

diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c
index 657d67294686..0f7b9d1b9c57 100644
--- a/drivers/media/i2c/soc_camera/ov772x.c
+++ b/drivers/media/i2c/soc_camera/ov772x.c
@@ -894,38 +894,15 @@ static int ov772x_get_fmt(struct v4l2_subdev *sd,
         return 0;
 }
 
-static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
-{
-        struct ov772x_priv *priv = to_ov772x(sd);
-        const struct ov772x_color_format *cfmt;
-        const struct ov772x_win_size *win;
-        int ret;
-
-        ov772x_select_params(mf, &cfmt, &win);
-
-        ret = ov772x_set_params(priv, cfmt, win);
-        if (ret < 0)
-                return ret;
-
-        priv->win = win;
-        priv->cfmt = cfmt;
-
-        mf->code = cfmt->code;
-        mf->width = win->rect.width;
-        mf->height = win->rect.height;
-        mf->field = V4L2_FIELD_NONE;
-        mf->colorspace = cfmt->colorspace;
-
-        return 0;
-}
-
 static int ov772x_set_fmt(struct v4l2_subdev *sd,
                 struct v4l2_subdev_pad_config *cfg,
                 struct v4l2_subdev_format *format)
 {
+        struct ov772x_priv *priv = to_ov772x(sd);
         struct v4l2_mbus_framefmt *mf = &format->format;
         const struct ov772x_color_format *cfmt;
         const struct ov772x_win_size *win;
+        int ret;
 
         if (format->pad)
                 return -EINVAL;
@@ -938,9 +915,17 @@ static int ov772x_set_fmt(struct v4l2_subdev *sd,
         mf->field = V4L2_FIELD_NONE;
         mf->colorspace = cfmt->colorspace;
 
-        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE)
-                return ov772x_s_fmt(sd, mf);
-        cfg->try_fmt = *mf;
+        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+                cfg->try_fmt = *mf;
+                return 0;
+        }
+
+        ret = ov772x_set_params(priv, cfmt, win);
+        if (ret < 0)
+                return ret;
+
+        priv->win = win;
+        priv->cfmt = cfmt;
         return 0;
 }