From 24b7220c2f88cebc925b539b789c2a66339a305c Mon Sep 17 00:00:00 2001
From: Muralidharan Karicheri <m-karicheri2@ti.com>
Date: Thu, 10 Dec 2009 10:31:44 -0300
Subject: [PATCH] --- yaml --- r: 176831 b: refs/heads/master c:
 422eaac5d5367bab71fa2cc33393b2ea894498fe h: refs/heads/master i:   176829:
 6d9c7c29092581ebc19107be5e1bbe1b00b4f896   176827:
 6f988fc89652432bb863bd10427416f0276230d2   176823:
 4347cf24ed6373a343115d50e19fd8a38a793965   176815:
 4aa22b19da18e0bba4da7666f135dbc2c2e5d28c   176799:
 5794e325e9b44f6bbaf89be97dfa80a42472ceb4   176767:
 e5de20ba31de8175ae20cd0dd4b9d6cbf720bf83 v: v3

---
 [refs]                                              | 2 +-
 trunk/Documentation/DocBook/v4l/vidioc-g-std.xml    | 6 ++++++
 trunk/Documentation/DocBook/v4l/vidioc-querystd.xml | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 39e69611499a..4bcd5e29cef0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e535ed5a16b8cc23301f3d26cfd49f3091aadcc
+refs/heads/master: 422eaac5d5367bab71fa2cc33393b2ea894498fe
diff --git a/trunk/Documentation/DocBook/v4l/vidioc-g-std.xml b/trunk/Documentation/DocBook/v4l/vidioc-g-std.xml
index b6f5d267e856..912f8513e5da 100644
--- a/trunk/Documentation/DocBook/v4l/vidioc-g-std.xml
+++ b/trunk/Documentation/DocBook/v4l/vidioc-g-std.xml
@@ -86,6 +86,12 @@ standards.</para>
 <constant>VIDIOC_S_STD</constant> parameter was unsuitable.</para>
 	</listitem>
       </varlistentry>
+      <varlistentry>
+	<term><errorcode>EBUSY</errorcode></term>
+	<listitem>
+	  <para>The device is busy and therefore can not change the standard</para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 </refentry>
diff --git a/trunk/Documentation/DocBook/v4l/vidioc-querystd.xml b/trunk/Documentation/DocBook/v4l/vidioc-querystd.xml
index b5a7ff934486..1a9e60393091 100644
--- a/trunk/Documentation/DocBook/v4l/vidioc-querystd.xml
+++ b/trunk/Documentation/DocBook/v4l/vidioc-querystd.xml
@@ -70,6 +70,12 @@ current video input or output.</para>
 	  <para>This ioctl is not supported.</para>
 	</listitem>
       </varlistentry>
+      <varlistentry>
+	<term><errorcode>EBUSY</errorcode></term>
+	<listitem>
+	  <para>The device is busy and therefore can not detect the standard</para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 </refentry>