]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] DocBook: EAGAIN == EWOULDBLOCK
authorHans Verkuil <hans.verkuil@cisco.com>
Fri, 21 Sep 2012 11:32:49 +0000 (08:32 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 26 Sep 2012 20:48:39 +0000 (17:48 -0300)
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>
Documentation/DocBook/media/v4l/gen-errors.xml

index 737ecaaa335da5688e17bbbe3b8df2007d539c9e..7e29a4e1f696ec0c898fa431c4ea9163b5a12de9 100644 (file)
@@ -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>
                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>