From 9190d191b1b814dfb488125b54cf0de6eedd9220 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 6 Jul 2011 14:08:08 -0300
Subject: [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>
---
Documentation/DocBook/media/v4l/gen-errors.xml | 13 ++++++-------
Documentation/DocBook/media/v4l/v4l2.xml | 2 ++
2 files changed, 8 insertions(+), 7 deletions(-)
(limited to 'Documentation')
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
@@ -30,13 +30,6 @@
allowed range. This is a widely used error code. See the individual
ioctl requests for specific causes.</entry>
</row>
- <row>
- <entry>EINVAL or ENOTTY</entry>
- <entry>The ioctl is not supported by the driver, actually meaning that
- the required functionality is not available, or the file
- descriptor is not for a media device. The usage of EINVAL is
- deprecated and will be fixed on a latter patch.</entry>
- </row>
<row>
<entry>ENODEV</entry>
<entry>Device not found or was removed.</entry>
@@ -45,6 +38,12 @@
<entry>ENOMEM</entry>
<entry>There's not enough memory to handle the desired operation.</entry>
</row>
+ <row>
+ <entry>ENOTTY</entry>
+ <entry>The ioctl is not supported by the driver, actually meaning that
+ the required functionality is not available, or the file
+ descriptor is not for a media device.</entry>
+ </row>
<row>
<entry>ENOSPC</entry>
<entry>On USB devices, the stream ioctl's can return this error, meaning
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. -->
<date>2011-06-27</date>
<authorinitials>mcc, po</authorinitials>
<revremark>Documented that VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one.</revremark>
+ <revremark>Standardize an error code for invalid ioctl.</revremark>
</revision>
+
<revision>
<revnumber>2.6.39</revnumber>
<date>2011-03-01</date>
--
cgit v1.2.3