summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2012-06-15 10:22:25 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 20:25:37 -0300
commit9a70d980d038e27828db92cef235fabfb618c77d (patch)
tree7d04bedd982199c6cf816426ab72bdc4a3007104 /Documentation/DocBook
parent6889d5ced744cb8a5a96d359e8c3bc4e62bdc36b (diff)
downloadlinux-9a70d980d038e27828db92cef235fabfb618c77d.tar.gz
linux-9a70d980d038e27828db92cef235fabfb618c77d.tar.bz2
linux-9a70d980d038e27828db92cef235fabfb618c77d.zip
[media] v4l: Correct conflicting V4L2 subdev selection API documentation
The API reference documents that the KEEP_CONFIG flag tells the configuration should not be propagated by the driver whereas the interface documentation (dev-subdev.xml) prohibited any changes to the rest of the pipeline. Resolve the conflict by changing the API reference to disallow changes. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r--Documentation/DocBook/media/v4l/selections-common.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/v4l/selections-common.xml b/Documentation/DocBook/media/v4l/selections-common.xml
index b6618709ee7a..7502f784b8cc 100644
--- a/Documentation/DocBook/media/v4l/selections-common.xml
+++ b/Documentation/DocBook/media/v4l/selections-common.xml
@@ -148,7 +148,7 @@
<row>
<entry><constant>V4L2_SEL_FLAG_KEEP_CONFIG</constant></entry>
<entry>(1 &lt;&lt; 2)</entry>
- <entry>The configuration should not be propagated to any
+ <entry>The configuration must not be propagated to any
further processing steps. If this flag is not given, the
configuration is propagated inside the subdevice to all
further processing steps.</entry>