Merge tag 'xtensa-20170507' of git://github.com/jcmvbkbc/linux-xtensa

[sfrench/cifs-2.6.git] / Documentation / media / uapi / v4l / vidioc-queryctrl.rst

diff --git a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
index 82769de801b1a3da79d2f10ab5ea467cf8cfee16..41c5744a1239726aa98f8bde348c470befa111a4 100644 (file)
--- a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
+++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
@@ -301,12 +301,12 @@ See also the examples in :ref:`control`.
       - ``name``\ [32]
       - Name of the menu item, a NUL-terminated ASCII string. This
        information is intended for the user. This field is valid for
-       ``V4L2_CTRL_FLAG_MENU`` type controls.
+       ``V4L2_CTRL_TYPE_MENU`` type controls.
     * -
       - __s64
       - ``value``
       - Value of the integer menu item. This field is valid for
-       ``V4L2_CTRL_FLAG_INTEGER_MENU`` type controls.
+       ``V4L2_CTRL_TYPE_INTEGER_MENU`` type controls.
     * - __u32
       -
       - ``reserved``
@@ -507,6 +507,19 @@ See also the examples in :ref:`control`.
        represents an action on the hardware. For example: clearing an
        error flag or triggering the flash. All the controls of the type
        ``V4L2_CTRL_TYPE_BUTTON`` have this flag set.
+    * .. _FLAG_MODIFY_LAYOUT:
+
+      - ``V4L2_CTRL_FLAG_MODIFY_LAYOUT``
+      - 0x0400
+      - Changing this control value may modify the layout of the
+        buffer (for video devices) or the media bus format (for sub-devices).
+
+       A typical example would be the ``V4L2_CID_ROTATE`` control.
+
+       Note that typically controls with this flag will also set the
+       ``V4L2_CTRL_FLAG_GRABBED`` flag when buffers are allocated or
+       streaming is in progress since most drivers do not support changing
+       the format in that case.
 
 
 Return Value