From dfccb74f78650931b95a5735bbc07a104129f837 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Fri, 31 Aug 2012 12:50:45 -0300 Subject: [PATCH] --- yaml --- r: 331224 b: refs/heads/master c: 9356ac762f85e4e769cc1cc1ae57b9807648a6c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/s5p-fimc/fimc-lite.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e664498f1505..d6f75de86fec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b98192cb8e39db5c4ee36101646cb82018e04d3a +refs/heads/master: 9356ac762f85e4e769cc1cc1ae57b9807648a6c8 diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c b/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c index 928900842715..cd4cf12d20e3 100644 --- a/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c +++ b/trunk/drivers/media/platform/s5p-fimc/fimc-lite.c @@ -1064,6 +1064,7 @@ static int fimc_lite_subdev_set_fmt(struct v4l2_subdev *sd, struct fimc_lite *fimc = v4l2_get_subdevdata(sd); struct v4l2_mbus_framefmt *mf = &fmt->format; struct flite_frame *sink = &fimc->inp_frame; + struct flite_frame *source = &fimc->out_frame; const struct fimc_fmt *ffmt; v4l2_dbg(1, debug, sd, "pad%d: code: 0x%x, %dx%d", @@ -1097,8 +1098,10 @@ static int fimc_lite_subdev_set_fmt(struct v4l2_subdev *sd, sink->rect.height = mf->height; sink->rect.left = 0; sink->rect.top = 0; - /* Reset source crop rectangle */ - fimc->out_frame.rect = sink->rect; + /* Reset source format and crop rectangle */ + source->rect = sink->rect; + source->f_width = mf->width; + source->f_height = mf->height; } else { /* Allow changing format only on sink pad */ mf->code = fimc->fmt->mbus_code;