diff options
| author | Sakari Ailus <[email protected]> | 2023-10-13 08:54:24 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <[email protected]> | 2023-11-23 17:33:06 +0000 |
| commit | 8824170e95d72d7583bd8e897246685d3856455a (patch) | |
| tree | 14f1da009c2338234aea7c7af95d84a23a9c4fe6 /drivers/media/v4l2-core/v4l2-subdev.c | |
| parent | media: v4l: subdev: Rename sub-device state information access functions (diff) | |
| download | kernel-8824170e95d72d7583bd8e897246685d3856455a.tar.gz kernel-8824170e95d72d7583bd8e897246685d3856455a.zip | |
media: v4l: subdev: v4l2_subdev_state_get_format always returns format now
Now that v4l2_subdev_state_get_format() always returns format, don't call
alternative v4l2_subdev_get_pad_format() anymore.
Signed-off-by: Sakari Ailus <[email protected]>
Reviewed-by: Laurent Pinchart <[email protected]>
Reviewed-by: Tomi Valkeinen <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-subdev.c')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-subdev.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index a6f480ef7881..9eef170934c5 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -1587,14 +1587,7 @@ int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, { struct v4l2_mbus_framefmt *fmt; - if (sd->flags & V4L2_SUBDEV_FL_STREAMS) - fmt = v4l2_subdev_state_get_format(state, format->pad, - format->stream); - else if (format->pad < sd->entity.num_pads && format->stream == 0) - fmt = v4l2_subdev_get_pad_format(sd, state, format->pad); - else - fmt = NULL; - + fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream); if (!fmt) return -EINVAL; |