From 4b7b34687723e8e481078db2776aa334583c8524 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 21 Sep 2012 08:32:49 -0300
Subject: [PATCH] --- yaml --- r: 331142 b: refs/heads/master c:
 6473262e80709e65b7dc71549b8b8e41c604809a h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/Documentation/DocBook/media/v4l/gen-errors.xml | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 891f661a45ca..0eb9fe47d56e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c287e91ff3d77e1538aca08a79e8f782e05d4bf
+refs/heads/master: 6473262e80709e65b7dc71549b8b8e41c604809a
diff --git a/trunk/Documentation/DocBook/media/v4l/gen-errors.xml b/trunk/Documentation/DocBook/media/v4l/gen-errors.xml
index 737ecaaa335d..7e29a4e1f696 100644
--- a/trunk/Documentation/DocBook/media/v4l/gen-errors.xml
+++ b/trunk/Documentation/DocBook/media/v4l/gen-errors.xml
@@ -7,10 +7,12 @@
     <tbody valign="top">
 	<!-- Keep it ordered alphabetically -->
       <row>
-	<entry>EAGAIN</entry>
+	<entry>EAGAIN (aka EWOULDBLOCK)</entry>
 	<entry>The ioctl can't be handled because the device is in state where
 	       it can't perform it. This could happen for example in case where
 	       device is sleeping and ioctl is performed to query statistics.
+	       It is also returned when the ioctl would need to wait
+	       for an event, but the device was opened in non-blocking mode.
 	</entry>
       </row>
       <row>
@@ -63,11 +65,6 @@
 		permission, or some special capabilities is needed
 		(e. g. root)</entry>
       </row>
-      <row>
-	<entry>EWOULDBLOCK</entry>
-	<entry>Operation would block. Used when the ioctl would need to wait
-	       for an event, but the device was opened in non-blocking mode.</entry>
-      </row>
     </tbody>
   </tgroup>
 </table>