From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Fri, 21 Sep 2012 11:32:49 +0000 (-0300)
Subject: [media] DocBook: EAGAIN == EWOULDBLOCK
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6473262e80709e65b7dc71549b8b8e41c604809a;p=linux-beck.git

[media] DocBook: EAGAIN == EWOULDBLOCK

Merge the two entries since they are one and the same error.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/Documentation/DocBook/media/v4l/gen-errors.xml b/Documentation/DocBook/media/v4l/gen-errors.xml
index 737ecaaa335d..7e29a4e1f696 100644
--- a/Documentation/DocBook/media/v4l/gen-errors.xml
+++ b/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>