aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2012-06-15 09:22:25 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 19:25:37 -0400
commit9a70d980d038e27828db92cef235fabfb618c77d (patch)
tree7d04bedd982199c6cf816426ab72bdc4a3007104 /Documentation/DocBook
parent6889d5ced744cb8a5a96d359e8c3bc4e62bdc36b (diff)
[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 b6618709ee7..7502f784b8c 100644
--- a/Documentation/DocBook/media/v4l/selections-common.xml
+++ b/Documentation/DocBook/media/v4l/selections-common.xml
@@ -148,7 +148,7 @@
148 <row> 148 <row>
149 <entry><constant>V4L2_SEL_FLAG_KEEP_CONFIG</constant></entry> 149 <entry><constant>V4L2_SEL_FLAG_KEEP_CONFIG</constant></entry>
150 <entry>(1 &lt;&lt; 2)</entry> 150 <entry>(1 &lt;&lt; 2)</entry>
151 <entry>The configuration should not be propagated to any 151 <entry>The configuration must not be propagated to any
152 further processing steps. If this flag is not given, the 152 further processing steps. If this flag is not given, the
153 configuration is propagated inside the subdevice to all 153 configuration is propagated inside the subdevice to all
154 further processing steps.</entry> 154 further processing steps.</entry>