[PATCH 5/6] media: adv7180: fill in mbus format in set_fmt

[Niklas Söderlund]

If the V4L2_SUBDEV_FORMAT_TRY is used in set_fmt the width, height etc
would not be filled.

Signed-off-by: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>
---
 drivers/media/i2c/adv7180.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index b77b0a4..a8b434b 100644
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -675,6 +675,7 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd,
 {
        struct adv7180_state *state = to_state(sd);
        struct v4l2_mbus_framefmt *framefmt;
+       int ret;
 
        switch (format->format.field) {
        case V4L2_FIELD_NONE:
@@ -686,8 +687,9 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd,
                break;
        }
 
+       ret = adv7180_mbus_fmt(sd,  &format->format);
+
        if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
-               framefmt = &format->format;
                if (state->field != format->format.field) {
                        state->field = format->format.field;
                        adv7180_set_power(state, false);
@@ -699,7 +701,7 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd,
                *framefmt = format->format;
        }
 
-       return adv7180_mbus_fmt(sd, framefmt);
+       return ret;
 }
 
 static int adv7180_g_mbus_config(struct v4l2_subdev *sd,
-- 
2.9.0

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html