---

yaml --- r: 168385 b: refs/heads/master c: 07bc46e h: refs/heads/master i: 168383: ee0f55a v: v3
git-mirror · Nov 7, 2009 · 506f921 · 506f921
1 parent 829746c
commit 506f921
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cf1fec877c102beeae1e13624b1f7d20abbf8f9
+refs/heads/master: 07bc46e6671b4533a5e56607ddec9de9079c1844
diff --git a/trunk/drivers/media/video/pxa_camera.c b/trunk/drivers/media/video/pxa_camera.c
@@ -1432,7 +1432,9 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
 		icd->sense = &sense;
 
 	cam_f.fmt.pix.pixelformat = cam_fmt->fourcc;
-	ret = v4l2_subdev_call(sd, video, s_fmt, f);
+	ret = v4l2_subdev_call(sd, video, s_fmt, &cam_f);
+	cam_f.fmt.pix.pixelformat = pix->pixelformat;
+	*pix = cam_f.fmt.pix;
 
 	icd->sense = NULL;