---

yaml --- r: 295133 b: refs/heads/master c: 02bbb81 h: refs/heads/master i: 295131: 68cc869 v: v3
git-mirror · Mar 20, 2012 · d39b6ca · d39b6ca
1 parent 0007c67
commit d39b6ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff38d58ec08e347f01fc380f774cedde6dec4103
+refs/heads/master: 02bbb814d8db7b632458fcf8651267798eeef985
diff --git a/trunk/drivers/media/video/v4l2-ioctl.c b/trunk/drivers/media/video/v4l2-ioctl.c
@@ -2455,7 +2455,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
 	/* Handles IOCTL */
 	err = func(file, cmd, parg);
 	if (err == -ENOIOCTLCMD)
-		err = -EINVAL;
+		err = -ENOTTY;
 
 	if (has_array_args) {
 		*kernel_ptr = user_ptr;