diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-06 13:08:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:38 -0400 |
commit | 9190d191b1b814dfb488125b54cf0de6eedd9220 (patch) | |
tree | a0d4888daa6b56ff06c2296b9e7b83b904682271 /Documentation/DocBook/media/v4l | |
parent | c28f53f6cd45de5cefe8dc7479236b745b97d49c (diff) |
[media] v4l2 core: return -ENOTTY if an ioctl doesn't exist
Currently, -EINVAL is used to return either when an IOCTL is not
implemented, or if the ioctl was not implemented.
Acked-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.xml | 13 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/v4l2.xml | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Documentation/DocBook/media/v4l/gen-errors.xml b/Documentation/DocBook/media/v4l/gen-errors.xml index 7c1980e8747b..5bbf3ce1973a 100644 --- a/Documentation/DocBook/media/v4l/gen-errors.xml +++ b/Documentation/DocBook/media/v4l/gen-errors.xml | |||
@@ -31,13 +31,6 @@ | |||
31 | ioctl requests for specific causes.</entry> | 31 | ioctl requests for specific causes.</entry> |
32 | </row> | 32 | </row> |
33 | <row> | 33 | <row> |
34 | <entry>EINVAL or ENOTTY</entry> | ||
35 | <entry>The ioctl is not supported by the driver, actually meaning that | ||
36 | the required functionality is not available, or the file | ||
37 | descriptor is not for a media device. The usage of EINVAL is | ||
38 | deprecated and will be fixed on a latter patch.</entry> | ||
39 | </row> | ||
40 | <row> | ||
41 | <entry>ENODEV</entry> | 34 | <entry>ENODEV</entry> |
42 | <entry>Device not found or was removed.</entry> | 35 | <entry>Device not found or was removed.</entry> |
43 | </row> | 36 | </row> |
@@ -46,6 +39,12 @@ | |||
46 | <entry>There's not enough memory to handle the desired operation.</entry> | 39 | <entry>There's not enough memory to handle the desired operation.</entry> |
47 | </row> | 40 | </row> |
48 | <row> | 41 | <row> |
42 | <entry>ENOTTY</entry> | ||
43 | <entry>The ioctl is not supported by the driver, actually meaning that | ||
44 | the required functionality is not available, or the file | ||
45 | descriptor is not for a media device.</entry> | ||
46 | </row> | ||
47 | <row> | ||
49 | <entry>ENOSPC</entry> | 48 | <entry>ENOSPC</entry> |
50 | <entry>On USB devices, the stream ioctl's can return this error, meaning | 49 | <entry>On USB devices, the stream ioctl's can return this error, meaning |
51 | that this request would overcommit the usb bandwidth reserved | 50 | that this request would overcommit the usb bandwidth reserved |
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml index c5ee3982cff5..43386a6aef76 100644 --- a/Documentation/DocBook/media/v4l/v4l2.xml +++ b/Documentation/DocBook/media/v4l/v4l2.xml | |||
@@ -132,7 +132,9 @@ applications. --> | |||
132 | <date>2011-06-27</date> | 132 | <date>2011-06-27</date> |
133 | <authorinitials>mcc, po</authorinitials> | 133 | <authorinitials>mcc, po</authorinitials> |
134 | <revremark>Documented that VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one.</revremark> | 134 | <revremark>Documented that VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one.</revremark> |
135 | <revremark>Standardize an error code for invalid ioctl.</revremark> | ||
135 | </revision> | 136 | </revision> |
137 | |||
136 | <revision> | 138 | <revision> |
137 | <revnumber>2.6.39</revnumber> | 139 | <revnumber>2.6.39</revnumber> |
138 | <date>2011-03-01</date> | 140 | <date>2011-03-01</date> |