commit 9a70d980d038e27828db92cef235fabfb618c77d
author Sakari Ailus <sakari.ailus@iki.fi> Fri Jun 15 10:22:25 2012 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Fri Jul 06 20:25:37 2012 -0300
tree 7d04bedd982199c6cf816426ab72bdc4a3007104
parent 6889d5ced744cb8a5a96d359e8c3bc4e62bdc36b

[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>

Documentation/DocBook/media/v4l/selections-common.xml

diff --git a/Documentation/DocBook/media/v4l/selections-common.xml b/Documentation/DocBook/media/v4l/selections-common.xml
index b661870..7502f78 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>