Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: Mauro Carvalho Chehab <mchehab <at> redhat.com>
Subject: [PATCH] [media] v4l2 core: return -ENOIOCTLCMD if an ioctl doesn't exist
Newsgroups: gmane.linux.drivers.video-input-infrastructure
Date: Friday 24th June 2011 23:11:51 UTC (over 6 years ago)
Currently, -EINVAL is used to return either when an IOCTL is not
implemented, or if the ioctl was not implemented.

Signed-off-by: Mauro Carvalho Chehab 
---
 Documentation/DocBook/media/Makefile           |    1 +
 Documentation/DocBook/media/v4l/func-ioctl.xml |   17 +++++++++--------
 drivers/media/video/v4l2-ioctl.c               |    4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Documentation/DocBook/media/Makefile
b/Documentation/DocBook/media/Makefile
index 8cb27f3..93722da 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -117,6 +117,7 @@ ERRORS = \
 	EPERM \
 	ERANGE \
 	EPIPE \
+	ENOIOCTLCMD \
 
 ESCAPE = \
 	-e "s/&/\\&/g" \
diff --git a/Documentation/DocBook/media/v4l/func-ioctl.xml
b/Documentation/DocBook/media/v4l/func-ioctl.xml
index b60fd37..0c97ba9 100644
--- a/Documentation/DocBook/media/v4l/func-ioctl.xml
+++ b/Documentation/DocBook/media/v4l/func-ioctl.xml
@@ -132,14 +132,15 @@ complete the request.
 &VIDIOC-S-CTRL; ioctl to a value which is out of bounds.
 	
       
+      
+	ENOIOCTLCMD
+	
+	  The application attempted to use a non-existent ioctl. This is
returned by the V4L2 core only.
+		Applications should be able to handle this error code, in order to
detect if a new ioctl is
+		not implemented at the current Kernel version. Kernel versions lower
than 3.0 returns EINVAL to
+		non-existing ioctl's.
+	
+      
     
   
 
-
-
diff --git a/drivers/media/video/v4l2-ioctl.c
b/drivers/media/video/v4l2-ioctl.c
index 61ac6bf..a0a2466 100644
--- 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 = -ENOIOCTLCMD;
 
 	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) &&
 
CD: 14ms