diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-21 07:32:49 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-26 16:48:39 -0400 |
commit | 6473262e80709e65b7dc71549b8b8e41c604809a (patch) | |
tree | 9b558376d512dcaf4e96410bee22f008f5cf5990 /Documentation/DocBook | |
parent | 7c287e91ff3d77e1538aca08a79e8f782e05d4bf (diff) |
[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')
-rw-r--r-- | Documentation/DocBook/media/v4l/gen-errors.xml | 9 |
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 @@ | |||
7 | <tbody valign="top"> | 7 | <tbody valign="top"> |
8 | <!-- Keep it ordered alphabetically --> | 8 | <!-- Keep it ordered alphabetically --> |
9 | <row> | 9 | <row> |
10 | <entry>EAGAIN</entry> | 10 | <entry>EAGAIN (aka EWOULDBLOCK)</entry> |
11 | <entry>The ioctl can't be handled because the device is in state where | 11 | <entry>The ioctl can't be handled because the device is in state where |
12 | it can't perform it. This could happen for example in case where | 12 | it can't perform it. This could happen for example in case where |
13 | device is sleeping and ioctl is performed to query statistics. | 13 | device is sleeping and ioctl is performed to query statistics. |
14 | It is also returned when the ioctl would need to wait | ||
15 | for an event, but the device was opened in non-blocking mode. | ||
14 | </entry> | 16 | </entry> |
15 | </row> | 17 | </row> |
16 | <row> | 18 | <row> |
@@ -63,11 +65,6 @@ | |||
63 | permission, or some special capabilities is needed | 65 | permission, or some special capabilities is needed |
64 | (e. g. root)</entry> | 66 | (e. g. root)</entry> |
65 | </row> | 67 | </row> |
66 | <row> | ||
67 | <entry>EWOULDBLOCK</entry> | ||
68 | <entry>Operation would block. Used when the ioctl would need to wait | ||
69 | for an event, but the device was opened in non-blocking mode.</entry> | ||
70 | </row> | ||
71 | </tbody> | 68 | </tbody> |
72 | </tgroup> | 69 | </tgroup> |
73 | </table> | 70 | </table> |