summaryrefslogtreecommitdiff
path: root/Documentation/DocBook/media/v4l
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-21 11:32:49 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-26 20:48:39 (GMT)
commit6473262e80709e65b7dc71549b8b8e41c604809a (patch)
tree9b558376d512dcaf4e96410bee22f008f5cf5990 /Documentation/DocBook/media/v4l
parent7c287e91ff3d77e1538aca08a79e8f782e05d4bf (diff)
downloadlinux-fsl-qoriq-6473262e80709e65b7dc71549b8b8e41c604809a.tar.xz
[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>
Diffstat (limited to 'Documentation/DocBook/media/v4l')
-rw-r--r--Documentation/DocBook/media/v4l/gen-errors.xml9
1 files changed, 3 insertions, 6 deletions
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>