diff mbox

[RFC,1/3] DocBook: EAGAIN == EWOULDBLOCK

Message ID 187f1fb0891d7ddeef202c6be7d86209c354a632.1348227670.git.hans.verkuil@cisco.com (mailing list archive)
State New, archived
Headers show

Commit Message

Hans Verkuil Sept. 21, 2012, 11:44 a.m. UTC 
From: Hans Verkuil <hans.verkuil@cisco.com>

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

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 Documentation/DocBook/media/v4l/gen-errors.xml |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/Documentation/DocBook/media/v4l/gen-errors.xml b/Documentation/DocBook/media/v4l/gen-errors.xml
index 737ecaa..7e29a4e 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>