diff options
| -rw-r--r-- | Documentation/DocBook/media/v4l/media-ioc-enum-links.xml | 2 | ||||
| -rw-r--r-- | Documentation/DocBook/media/v4l/subdev-formats.xml | 2 | ||||
| -rw-r--r-- | Documentation/media-framework.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml index d2fc73ef8d56..355df43badc5 100644 --- a/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-links.xml @@ -139,7 +139,7 @@ </table> <table pgwide="1" frame="none" id="media-link-desc"> - <title>struct <structname>media_links_desc</structname></title> + <title>struct <structname>media_link_desc</structname></title> <tgroup cols="3"> &cs-str; <tbody valign="top"> diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml index bab70711c7c4..49c532ebbbbe 100644 --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml @@ -2525,7 +2525,7 @@ <para>Those data formats consist of an ordered sequence of 8-bit bytes obtained from JPEG compression process. Additionally to the - <constant>_JPEG</constant> prefix the format code is made of + <constant>_JPEG</constant> postfix the format code is made of the following information. <itemizedlist> <listitem><para>The number of bus samples per entropy encoded byte.</para></listitem> diff --git a/Documentation/media-framework.txt b/Documentation/media-framework.txt index 76a2087db205..669b5fb03a86 100644 --- a/Documentation/media-framework.txt +++ b/Documentation/media-framework.txt @@ -310,7 +310,7 @@ is non-immutable. The operation must either configure the hardware or store the configuration information to be applied later. Link configuration must not have any side effect on other links. If an enabled -link at a sink pad prevents another link at the same pad from being disabled, +link at a sink pad prevents another link at the same pad from being enabled, the link_setup operation must return -EBUSY and can't implicitly disable the first enabled link. |