aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/mt9m001.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/mt9m001.c')
-rw-r--r--drivers/media/video/mt9m001.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 0c524376b67e..0bcfef7b1c17 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -285,8 +285,8 @@ static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd)
285 width_flag; 285 width_flag;
286} 286}
287 287
288static int mt9m001_set_fmt_cap(struct soc_camera_device *icd, 288static int mt9m001_set_fmt(struct soc_camera_device *icd,
289 __u32 pixfmt, struct v4l2_rect *rect) 289 __u32 pixfmt, struct v4l2_rect *rect)
290{ 290{
291 struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd); 291 struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
292 int ret; 292 int ret;
@@ -298,7 +298,7 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
298 ret = reg_write(icd, MT9M001_VERTICAL_BLANKING, vblank); 298 ret = reg_write(icd, MT9M001_VERTICAL_BLANKING, vblank);
299 299
300 /* The caller provides a supported format, as verified per 300 /* The caller provides a supported format, as verified per
301 * call to icd->try_fmt_cap() */ 301 * call to icd->try_fmt() */
302 if (!ret) 302 if (!ret)
303 ret = reg_write(icd, MT9M001_COLUMN_START, rect->left); 303 ret = reg_write(icd, MT9M001_COLUMN_START, rect->left);
304 if (!ret) 304 if (!ret)
@@ -325,8 +325,8 @@ static int mt9m001_set_fmt_cap(struct soc_camera_device *icd,
325 return ret; 325 return ret;
326} 326}
327 327
328static int mt9m001_try_fmt_cap(struct soc_camera_device *icd, 328static int mt9m001_try_fmt(struct soc_camera_device *icd,
329 struct v4l2_format *f) 329 struct v4l2_format *f)
330{ 330{
331 if (f->fmt.pix.height < 32 + icd->y_skip_top) 331 if (f->fmt.pix.height < 32 + icd->y_skip_top)
332 f->fmt.pix.height = 32 + icd->y_skip_top; 332 f->fmt.pix.height = 32 + icd->y_skip_top;
@@ -447,8 +447,8 @@ static struct soc_camera_ops mt9m001_ops = {
447 .release = mt9m001_release, 447 .release = mt9m001_release,
448 .start_capture = mt9m001_start_capture, 448 .start_capture = mt9m001_start_capture,
449 .stop_capture = mt9m001_stop_capture, 449 .stop_capture = mt9m001_stop_capture,
450 .set_fmt_cap = mt9m001_set_fmt_cap, 450 .set_fmt = mt9m001_set_fmt,
451 .try_fmt_cap = mt9m001_try_fmt_cap, 451 .try_fmt = mt9m001_try_fmt,
452 .set_bus_param = mt9m001_set_bus_param, 452 .set_bus_param = mt9m001_set_bus_param,
453 .query_bus_param = mt9m001_query_bus_param, 453 .query_bus_param = mt9m001_query_bus_param,
454 .controls = mt9m001_controls, 454 .controls = mt9m001_controls,