From 33884f15d8e86199bda1f88f66d7c60fa4279a9e Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Thu, 8 Dec 2011 06:56:22 -0300 Subject: [PATCH] --- yaml --- r: 276877 b: refs/heads/master c: 393a23fc9377ac3deaa97c5cc00b5c78746c8570 h: refs/heads/master i: 276875: e32a38ad11c4c7879b23832ed21baa813c0e78f6 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/fimc-capture.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 618fca55b3f3..38eb76024a4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a32390d808b5b7a6b1c7f9236673c917b4733f13 +refs/heads/master: 393a23fc9377ac3deaa97c5cc00b5c78746c8570 diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c index 82d9ab6984eb..2cc3b9166724 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c @@ -1242,6 +1242,7 @@ static int fimc_subdev_set_fmt(struct v4l2_subdev *sd, mutex_lock(&fimc->lock); set_frame_bounds(ff, mf->width, mf->height); + fimc->vid_cap.mf = *mf; ff->fmt = ffmt; /* Reset the crop rectangle if required. */