summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2010-06-05 10:35:29 -0400
committerChris Metcalf <cmetcalf@tilera.com>2010-06-05 10:35:29 -0400
commitcc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch)
tree98a7958212ac61345300944f512a949e5ee3e513 /Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
parent482e6f8466ab1066f1a969bcdbe916b56439622c (diff)
parent7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (diff)
downloadop-kernel-dev-cc44826a26b12b2489bc7dbb597fcdf107f2cc01.zip
op-kernel-dev-cc44826a26b12b2489bc7dbb597fcdf107f2cc01.tar.gz
Merge branch 'master' into for-linus
Diffstat (limited to 'Documentation/DocBook/v4l/vidioc-query-dv-preset.xml')
-rw-r--r--Documentation/DocBook/v4l/vidioc-query-dv-preset.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml b/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
index 87e4f0f..402229e 100644
--- a/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
+++ b/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
@@ -53,8 +53,10 @@ input</refpurpose>
automatically, similar to sensing the video standard. To do so, applications
call <constant> VIDIOC_QUERY_DV_PRESET</constant> with a pointer to a
&v4l2-dv-preset; type. Once the hardware detects a preset, that preset is
-returned in the preset field of &v4l2-dv-preset;. When detection is not
-possible or fails, the value V4L2_DV_INVALID is returned.</para>
+returned in the preset field of &v4l2-dv-preset;. If the preset could not be
+detected because there was no signal, or the signal was unreliable, or the
+signal did not map to a supported preset, then the value V4L2_DV_INVALID is
+returned.</para>
</refsect1>
<refsect1>
OpenPOWER on IntegriCloud