aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2014-05-19 11:04:32 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-22 00:00:06 -0400
commit7ed0b291b497c241cd567ff9d9b3b9cbf714466e (patch)
tree7a3bf69b235e408b87f5286f097f4f506211f92a /drivers/media/i2c
parentd53ce5acf8d02f2d55702c17a875c8fb351cc66b (diff)
[media] v4l: smiapp: Return V4L2_FIELD_NONE from pad-level get/set format
The SMIA++ sensors are progressive, always return the field order set to V4L2_FIELD_NONE. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/smiapp/smiapp-core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 13411e9a0e25..1eaf975d3612 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -1554,6 +1554,7 @@ static int __smiapp_get_format(struct v4l2_subdev *subdev,
1554 fmt->format.code = __smiapp_get_mbus_code(subdev, fmt->pad); 1554 fmt->format.code = __smiapp_get_mbus_code(subdev, fmt->pad);
1555 fmt->format.width = r->width; 1555 fmt->format.width = r->width;
1556 fmt->format.height = r->height; 1556 fmt->format.height = r->height;
1557 fmt->format.field = V4L2_FIELD_NONE;
1557 } 1558 }
1558 1559
1559 return 0; 1560 return 0;
@@ -1687,6 +1688,7 @@ static int smiapp_set_format(struct v4l2_subdev *subdev,
1687 fmt->format.code = __smiapp_get_mbus_code(subdev, fmt->pad); 1688 fmt->format.code = __smiapp_get_mbus_code(subdev, fmt->pad);
1688 fmt->format.width &= ~1; 1689 fmt->format.width &= ~1;
1689 fmt->format.height &= ~1; 1690 fmt->format.height &= ~1;
1691 fmt->format.field = V4L2_FIELD_NONE;
1690 1692
1691 fmt->format.width = 1693 fmt->format.width =
1692 clamp(fmt->format.width, 1694 clamp(fmt->format.width,
@@ -2674,6 +2676,7 @@ static int smiapp_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
2674 try_fmt->width = sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1; 2676 try_fmt->width = sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;
2675 try_fmt->height = sensor->limits[SMIAPP_LIMIT_Y_ADDR_MAX] + 1; 2677 try_fmt->height = sensor->limits[SMIAPP_LIMIT_Y_ADDR_MAX] + 1;
2676 try_fmt->code = mbus_code; 2678 try_fmt->code = mbus_code;
2679 try_fmt->field = V4L2_FIELD_NONE;
2677 2680
2678 try_crop->top = 0; 2681 try_crop->top = 0;
2679 try_crop->left = 0; 2682 try_crop->left = 0;