aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-21 08:32:49 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-26 17:48:39 -0300
commit6473262e80709e65b7dc71549b8b8e41c604809a (patch)
tree9b558376d512dcaf4e96410bee22f008f5cf5990 /Documentation/DocBook/media
parent[media] Docbook: add missing vidioc-subdev-g-edid.xml (diff)
downloadlinux-dev-6473262e80709e65b7dc71549b8b8e41c604809a.tar.xz
linux-dev-6473262e80709e65b7dc71549b8b8e41c604809a.zip
[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')
-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 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>