From b78396024bb48e7fbd1bd08d9bc2a0a089a94ba1 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Tue, 8 May 2012 17:41:33 -0300 Subject: [PATCH] --- yaml --- r: 306463 b: refs/heads/master c: 9633c0867fb5fc1eef8bd3c4e7f413034d2c5367 h: refs/heads/master i: 306461: 17f9db04d95db235abb98b6eabccc5cd6e5a27d7 306459: 565eb348b02915ac837345f3c6ab982cf8eac4cb 306455: 4885803d9b2d99b568be0614322760caeaa2a7d4 306447: 0cd6c62570f93febaad54a40afb042c4d3a7a7ad 306431: 525562f4cd1ad9abbd39b0b41f41713b397b4ecb v: v3 --- [refs] | 2 +- trunk/drivers/media/video/soc_camera.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 68c49a3da320..578257bbc246 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67e86524b907ed2189f4875cdbe7a5249c71ebb2 +refs/heads/master: 9633c0867fb5fc1eef8bd3c4e7f413034d2c5367 diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c index cfac53544ba6..0421bf9453b4 100644 --- a/trunk/drivers/media/video/soc_camera.c +++ b/trunk/drivers/media/video/soc_camera.c @@ -1262,7 +1262,7 @@ static int default_enum_framesizes(struct soc_camera_device *icd, /* map xlate-code to pixel_format, sensor only handle xlate-code*/ fsize_mbus.pixel_format = xlate->code; - ret = v4l2_subdev_call(sd, video, enum_mbus_fsizes, &fsize_mbus); + ret = v4l2_subdev_call(sd, video, enum_framesizes, &fsize_mbus); if (ret < 0) return ret;