From 34feb5c5b8c125623658ea6a1a6ec8f299ca7864 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 22 Jun 2012 05:47:30 -0300
Subject: [PATCH] --- yaml --- r: 320135 b: refs/heads/master c:
 5d44f5e3e388739f017a74e73dab2a995673915f h: refs/heads/master i:   320133:
 6c6f99d1106b1148f5acce64d784287d7494767e   320131:
 682126c47409f0578469c7426d3a05d0f8eda894   320127:
 386170ab98e8a6e07efed77c2318bcd6275c8c2f v: v3

---
 [refs]                                                    | 2 +-
 .../DocBook/media/v4l/vidioc-create-bufs.xml              | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8f033f499573..108330c90b60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f05393d2eb45b3cc9663223c3709134ccef51290
+refs/heads/master: 5d44f5e3e388739f017a74e73dab2a995673915f
diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
index a2474ecb574a..5e73b1c8d095 100644
--- a/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
+++ b/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
@@ -97,7 +97,13 @@ information.</para>
 	  <row>
 	    <entry>__u32</entry>
 	    <entry><structfield>count</structfield></entry>
-	    <entry>The number of buffers requested or granted.</entry>
+	    <entry>The number of buffers requested or granted. If count == 0, then
+	    <constant>VIDIOC_CREATE_BUFS</constant> will set <structfield>index</structfield>
+	    to the current number of created buffers, and it will check the validity of
+	    <structfield>memory</structfield> and <structfield>format.type</structfield>.
+	    If those are invalid -1 is returned and errno is set to &EINVAL;,
+	    otherwise <constant>VIDIOC_CREATE_BUFS</constant> returns 0. It will
+	    never set errno to &EBUSY; in this particular case.</entry>
 	  </row>
 	  <row>
 	    <entry>__u32</entry>