[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>

diff --git a/Documentation/DocBook/media/v4l/gen-errors.xml b/Documentation/DocBook/media/v4l/gen-errors.xml
index 7c1980e8747b1a3c11629f5da70431918cdcf618..5bbf3ce1973a8df5d72619ce3df4cc62de52b036 100644 (file)
--- 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 c5ee3982cff56205c1932de137ff443837999f37..43386a6aef76d6946f8dc25032a41399c93b4dd3 100644 (file)
--- 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>

diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 29f7a7df34c35ec18ebf0e7e762af073ec2bbe8c..002ce1363443338a714fca863f254968a224f6ee 100644 (file)
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -543,12 +543,12 @@ static long __video_do_ioctl(struct file *file,
        struct v4l2_fh *vfh = NULL;
        struct v4l2_format f_copy;
        int use_fh_prio = 0;
-       long ret = -EINVAL;
+       long ret = -ENOTTY;
 
        if (ops == NULL) {
                printk(KERN_WARNING "videodev: \"%s\" has no ioctl_ops.\n",
                                vfd->name);
-               return -EINVAL;
+               return ret;
        }
 
        if ((vfd->debug & V4L2_DEBUG_IOCTL) &&