Commit d46cfdc8 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Mauro Carvalho Chehab

media: i2c: imx290: set the format before VIDIOC_SUBDEV_G_FMT is called

With the current driver 'media-ctl -p' issued right after the imx290 driver
is loaded prints:
pad0: Source
             [fmt:unknown/0x0]

The format value of zero is due to the current_format field of the imx290
struct not being initialized yet.

As imx290_entity_init_cfg() calls imx290_set_fmt(), the current_mode field
is also initialized, so the line which set current_mode to a default value
in driver's probe() function is no longer needed.
Signed-off-by: default avatarAndrey Konovalov <andrey.konovalov@linaro.org>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent dc7690a7
...@@ -722,9 +722,6 @@ static int imx290_probe(struct i2c_client *client) ...@@ -722,9 +722,6 @@ static int imx290_probe(struct i2c_client *client)
goto free_err; goto free_err;
} }
/* Set default mode to max resolution */
imx290->current_mode = &imx290_modes[0];
/* get system clock (xclk) */ /* get system clock (xclk) */
imx290->xclk = devm_clk_get(dev, "xclk"); imx290->xclk = devm_clk_get(dev, "xclk");
if (IS_ERR(imx290->xclk)) { if (IS_ERR(imx290->xclk)) {
...@@ -809,6 +806,9 @@ static int imx290_probe(struct i2c_client *client) ...@@ -809,6 +806,9 @@ static int imx290_probe(struct i2c_client *client)
goto free_ctrl; goto free_ctrl;
} }
/* Initialize the frame format (this also sets imx290->current_mode) */
imx290_entity_init_cfg(&imx290->sd, NULL);
ret = v4l2_async_register_subdev(&imx290->sd); ret = v4l2_async_register_subdev(&imx290->sd);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Could not register v4l2 device\n"); dev_err(dev, "Could not register v4l2 device\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment