diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-05-04 12:25:55 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-04-15 03:32:26 +0200 |
| commit | 34b92def75da204c1cb75d43f55bc99ac371531a (patch) | |
| tree | a7d5ee4a3750053935f4f080e85943d84b9af311 | |
| parent | [media] ov9640: avoid calling ov9640_res_roundup() twice (diff) | |
| download | linux-34b92def75da204c1cb75d43f55bc99ac371531a.tar.xz linux-34b92def75da204c1cb75d43f55bc99ac371531a.zip | |
[media] ov9740: avoid calling ov9740_res_roundup() twice
Simplify ov9740_s_fmt.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
| -rw-r--r-- | drivers/media/i2c/soc_camera/ov9740.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c index 2436ed54f63f..cc07b7ae5407 100644 --- a/drivers/media/i2c/soc_camera/ov9740.c +++ b/drivers/media/i2c/soc_camera/ov9740.c @@ -673,20 +673,8 @@ static int ov9740_s_fmt(struct v4l2_subdev *sd, { struct i2c_client *client = v4l2_get_subdevdata(sd); struct ov9740_priv *priv = to_ov9740(sd); - enum v4l2_colorspace cspace; - u32 code = mf->code; int ret; - ov9740_res_roundup(&mf->width, &mf->height); - - switch (code) { - case MEDIA_BUS_FMT_YUYV8_2X8: - cspace = V4L2_COLORSPACE_SRGB; - break; - default: - return -EINVAL; - } - ret = ov9740_reg_write_array(client, ov9740_defaults, ARRAY_SIZE(ov9740_defaults)); if (ret < 0) @@ -696,11 +684,7 @@ static int ov9740_s_fmt(struct v4l2_subdev *sd, if (ret < 0) return ret; - mf->code = code; - mf->colorspace = cspace; - - memcpy(&priv->current_mf, mf, sizeof(struct v4l2_mbus_framefmt)); - + priv->current_mf = *mf; return ret; } |