From 0074bf509cd90f874371d11d7eef90440a934e68 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Mon, 3 Sep 2012 09:21:59 -0300
Subject: [PATCH] --- yaml --- r: 331089 b: refs/heads/master c:
 6bd4dd27f926519527b9c39709df13ad120d63f9 h: refs/heads/master i:   331087:
 dbe78d57e9cb722e6bac3f98435fc51a85e84a6b v: v3

---
 [refs]                                                    | 2 +-
 trunk/Documentation/DocBook/media/v4l/vidioc-streamon.xml | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 80fc69c974b5..1f86fe6550a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e19b3475072682312de71f4dddf6d4f4081e143
+refs/heads/master: 6bd4dd27f926519527b9c39709df13ad120d63f9
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-streamon.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-streamon.xml
index 81cca4569050..716ea15e54a1 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-streamon.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-streamon.xml
@@ -74,7 +74,12 @@ not transmitted yet. I/O returns to the same state as after calling
 stream type. This is the same as &v4l2-requestbuffers;
 <structfield>type</structfield>.</para>
 
-    <para>Note applications can be preempted for unknown periods right
+    <para>If <constant>VIDIOC_STREAMON</constant> is called when streaming
+is already in progress, or if <constant>VIDIOC_STREAMOFF</constant> is called
+when streaming is already stopped, then the ioctl does nothing and 0 is
+returned.</para>
+
+    <para>Note that applications can be preempted for unknown periods right
 before or after the <constant>VIDIOC_STREAMON</constant> or
 <constant>VIDIOC_STREAMOFF</constant> calls, there is no notion of
 starting or stopping "now". Buffer timestamps can be used to