aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/mt9v022.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/mt9v022.c')
-rw-r--r--drivers/media/video/mt9v022.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index 2584201059d8..3a39f0288599 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -337,14 +337,14 @@ static unsigned long mt9v022_query_bus_param(struct soc_camera_device *icd)
337 width_flag; 337 width_flag;
338} 338}
339 339
340static int mt9v022_set_fmt_cap(struct soc_camera_device *icd, 340static int mt9v022_set_fmt(struct soc_camera_device *icd,
341 __u32 pixfmt, struct v4l2_rect *rect) 341 __u32 pixfmt, struct v4l2_rect *rect)
342{ 342{
343 struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd); 343 struct mt9v022 *mt9v022 = container_of(icd, struct mt9v022, icd);
344 int ret; 344 int ret;
345 345
346 /* The caller provides a supported format, as verified per call to 346 /* The caller provides a supported format, as verified per call to
347 * icd->try_fmt_cap(), datawidth is from our supported format list */ 347 * icd->try_fmt(), datawidth is from our supported format list */
348 switch (pixfmt) { 348 switch (pixfmt) {
349 case V4L2_PIX_FMT_GREY: 349 case V4L2_PIX_FMT_GREY:
350 case V4L2_PIX_FMT_Y16: 350 case V4L2_PIX_FMT_Y16:
@@ -400,8 +400,8 @@ static int mt9v022_set_fmt_cap(struct soc_camera_device *icd,
400 return 0; 400 return 0;
401} 401}
402 402
403static int mt9v022_try_fmt_cap(struct soc_camera_device *icd, 403static int mt9v022_try_fmt(struct soc_camera_device *icd,
404 struct v4l2_format *f) 404 struct v4l2_format *f)
405{ 405{
406 if (f->fmt.pix.height < 32 + icd->y_skip_top) 406 if (f->fmt.pix.height < 32 + icd->y_skip_top)
407 f->fmt.pix.height = 32 + icd->y_skip_top; 407 f->fmt.pix.height = 32 + icd->y_skip_top;
@@ -538,8 +538,8 @@ static struct soc_camera_ops mt9v022_ops = {
538 .release = mt9v022_release, 538 .release = mt9v022_release,
539 .start_capture = mt9v022_start_capture, 539 .start_capture = mt9v022_start_capture,
540 .stop_capture = mt9v022_stop_capture, 540 .stop_capture = mt9v022_stop_capture,
541 .set_fmt_cap = mt9v022_set_fmt_cap, 541 .set_fmt = mt9v022_set_fmt,
542 .try_fmt_cap = mt9v022_try_fmt_cap, 542 .try_fmt = mt9v022_try_fmt,
543 .set_bus_param = mt9v022_set_bus_param, 543 .set_bus_param = mt9v022_set_bus_param,
544 .query_bus_param = mt9v022_query_bus_param, 544 .query_bus_param = mt9v022_query_bus_param,
545 .controls = mt9v022_controls, 545 .controls = mt9v022_controls,