Commit 4e4ef86f authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Mauro Carvalho Chehab

media: rcar-vin: Do not sync subdevice format when opening the video device

The format is already synced when the subdevice is bound, there is no
need to do do it every time the video device is opened.
Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarUlrich Hecht <uli+renesas@fpond.eu>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 11492ee7
...@@ -782,38 +782,13 @@ static int rvin_initialize_device(struct file *file) ...@@ -782,38 +782,13 @@ static int rvin_initialize_device(struct file *file)
struct rvin_dev *vin = video_drvdata(file); struct rvin_dev *vin = video_drvdata(file);
int ret; int ret;
struct v4l2_format f = {
.type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
.fmt.pix = {
.width = vin->format.width,
.height = vin->format.height,
.field = vin->format.field,
.colorspace = vin->format.colorspace,
.pixelformat = vin->format.pixelformat,
},
};
ret = rvin_power_on(vin); ret = rvin_power_on(vin);
if (ret < 0) if (ret < 0)
return ret; return ret;
/*
* Try to configure with default parameters. Notice: this is the
* very first open, so, we cannot race against other calls,
* apart from someone else calling open() simultaneously, but
* .host_lock is protecting us against it.
*/
ret = rvin_s_fmt_vid_cap(file, NULL, &f);
if (ret < 0)
goto esfmt;
v4l2_ctrl_handler_setup(&vin->ctrl_handler); v4l2_ctrl_handler_setup(&vin->ctrl_handler);
return 0; return 0;
esfmt:
rvin_power_off(vin);
return ret;
} }
static int rvin_open(struct file *file) static int rvin_open(struct file *file)
......
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