| From f6875b20fbd52e667e5fc89a8e6bcea91f246b12 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 20 Jul 2023 10:08:28 +0200 |
| Subject: media: Documentation: Fix [GS]_ROUTING documentation |
| |
| From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> |
| |
| [ Upstream commit 997a6b01cd97b74684728d5af6511c333f25957d ] |
| |
| Add mention that successful VIDIOC_SUBDEV_G_ROUTING call will update |
| 'num_routes' and remove mention about non-existing streams, which is |
| incorrect. |
| |
| Fixes: ea73eda50813 ("media: Documentation: Add GS_ROUTING documentation") |
| Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| .../userspace-api/media/v4l/vidioc-subdev-g-routing.rst | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst b/Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst |
| index 2d6e3bbdd0404..72677a280cd64 100644 |
| --- a/Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst |
| +++ b/Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst |
| @@ -58,6 +58,9 @@ the subdevice exposes, drivers return the ENOSPC error code and adjust the |
| value of the ``num_routes`` field. Application should then reserve enough memory |
| for all the route entries and call ``VIDIOC_SUBDEV_G_ROUTING`` again. |
| |
| +On a successful ``VIDIOC_SUBDEV_G_ROUTING`` call the driver updates the |
| +``num_routes`` field to reflect the actual number of routes returned. |
| + |
| .. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}| |
| |
| .. c:type:: v4l2_subdev_routing |
| @@ -138,9 +141,7 @@ ENOSPC |
| |
| EINVAL |
| The sink or source pad identifiers reference a non-existing pad, or reference |
| - pads of different types (ie. the sink_pad identifiers refers to a source pad) |
| - or the sink or source stream identifiers reference a non-existing stream on |
| - the sink or source pad. |
| + pads of different types (ie. the sink_pad identifiers refers to a source pad). |
| |
| E2BIG |
| The application provided ``num_routes`` for ``VIDIOC_SUBDEV_S_ROUTING`` is |
| -- |
| 2.40.1 |
| |