diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml b/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml
index 12b1d0503e26..ee2820d6ca66 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml
@@ -64,7 +64,9 @@ return an &EINVAL;. When the value is out
of bounds drivers can choose to take the closest valid value or return
an &ERANGE;, whatever seems more appropriate. However,
VIDIOC_S_CTRL is a write-only ioctl, it does not
-return the actual new value.
+return the actual new value. If the value
+is inappropriate for the control (e.g. if it refers to an unsupported
+menu index of a menu control), then &EINVAL; is returned as well.
These ioctls work only with user controls. For other
control classes the &VIDIOC-G-EXT-CTRLS;, &VIDIOC-S-EXT-CTRLS; or
@@ -99,7 +101,9 @@ application.
EINVAL
The &v4l2-control; id is
-invalid.
+invalid or the value is inappropriate for
+the given control (i.e. if a menu item is selected that is not supported
+by the driver according to &VIDIOC-QUERYMENU;).
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
index 42ffbff6d37e..4e16112df992 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
@@ -106,7 +106,9 @@ value or if an error is returned.
&EINVAL;. When the value is out of bounds drivers can choose to take
the closest valid value or return an &ERANGE;, whatever seems more
appropriate. In the first case the new value is set in
-&v4l2-ext-control;.
+&v4l2-ext-control;. If the new control value is inappropriate (e.g. the
+given menu index is not supported by the menu control), then this will
+also result in an &EINVAL; error.
The driver will only set/get these controls if all control
values are correct. This prevents the situation where only some of the
@@ -331,8 +333,10 @@ These controls are described in EINVAL
The &v4l2-ext-control; id
-is invalid or the &v4l2-ext-controls;
-ctrl_class is invalid. This error code is
+is invalid, the &v4l2-ext-controls;
+ctrl_class is invalid, or the &v4l2-ext-control;
+value was inappropriate (e.g. the given menu
+index is not supported by the driver). This error code is
also returned by the VIDIOC_S_EXT_CTRLS and
VIDIOC_TRY_EXT_CTRLS ioctls if two or more
control values are in conflict.