Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for...

[can-eth-gw-linux.git] / Documentation / DocBook / media / v4l / gen-errors.xml

diff --git a/Documentation/DocBook/media/v4l/gen-errors.xml b/Documentation/DocBook/media/v4l/gen-errors.xml
index 5bbf3ce1973a8df5d72619ce3df4cc62de52b036..7e29a4e1f696ec0c898fa431c4ea9163b5a12de9 100644 (file)
--- a/Documentation/DocBook/media/v4l/gen-errors.xml
+++ b/Documentation/DocBook/media/v4l/gen-errors.xml
@@ -6,6 +6,15 @@
     &cs-str;
     <tbody valign="top">
        <!-- Keep it ordered alphabetically -->
+      <row>
+       <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>
        <entry>EBADF</entry>
        <entry>The file descriptor is not a valid.</entry>
@@ -50,22 +59,12 @@
               that this request would overcommit the usb bandwidth reserved
               for periodic transfers (up to 80% of the USB bandwidth).</entry>
       </row>
-      <row>
-       <entry>ENOSYS or EOPNOTSUPP</entry>
-       <entry>Function not available for this device (dvb API only. Will likely
-              be replaced anytime soon by ENOTTY).</entry>
-      </row>
       <row>
        <entry>EPERM</entry>
        <entry>Permission denied. Can be returned if the device needs write
                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>