AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-17 01:26:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

media: ov2640: set default window and format code at probe time

Browse Source 
Set default window and format code at probe time instead of always checking
if they have not been set yet when VIDIOC_SUBDEV_G_FMT ioctl is called.

This change simplifies the next patch (make VIDIOC_SUBDEV_G_FMT ioctl work
with V4L2_SUBDEV_FORMAT_TRY).

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Akinobu Mita 2018-12-09 00:20:31 -05:00 committed by Mauro Carvalho Chehab
parent 47ee7bde31
commit b0a7d0e1c0
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/i2c/ov2640.c
View File

@ -842,9 +842,6 @@ static int ov2640_set_params(struct i2c_client *client,
u8 val; u8 val;
int ret; int ret;
if (!win)
return -EINVAL;
switch (code) { switch (code) {
case MEDIA_BUS_FMT_RGB565_2X8_BE: case MEDIA_BUS_FMT_RGB565_2X8_BE:
dev_dbg(&client->dev, "%s: Selected cfmt RGB565 BE", __func__); dev_dbg(&client->dev, "%s: Selected cfmt RGB565 BE", __func__);
@ -929,10 +926,6 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd,
if (format->pad) if (format->pad)
return -EINVAL; return -EINVAL;
if (!priv->win) {
priv->win = ov2640_select_win(SVGA_WIDTH, SVGA_HEIGHT);
priv->cfmt_code = MEDIA_BUS_FMT_UYVY8_2X8;
}
mf->width = priv->win->width; mf->width = priv->win->width;
mf->height = priv->win->height; mf->height = priv->win->height;
@ -1193,6 +1186,9 @@ static int ov2640_probe(struct i2c_client *client,
if (ret) if (ret)
goto err_clk; goto err_clk;
priv->win = ov2640_select_win(SVGA_WIDTH, SVGA_HEIGHT);
priv->cfmt_code = MEDIA_BUS_FMT_UYVY8_2X8;
v4l2_i2c_subdev_init(&priv->subdev, client, &ov2640_subdev_ops); v4l2_i2c_subdev_init(&priv->subdev, client, &ov2640_subdev_ops);
priv->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | priv->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
V4L2_SUBDEV_FL_HAS_EVENTS; V4L2_SUBDEV_FL_HAS_EVENTS;