---

yaml --- r: 92738 b: refs/heads/master c: 130ca94 h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · 4065d03 · 4065d03
1 parent c9e1df6
commit 4065d03
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87dd965f101bafea7c5e507f686814a0f0057417
+refs/heads/master: 130ca945d83637046bde4943629f011e22831fd3
diff --git a/trunk/drivers/media/video/videodev.c b/trunk/drivers/media/video/videodev.c
@@ -1861,6 +1861,13 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 			dbgarg (cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision);
 		break;
 	}
+	default:
+	{
+		if (!vfd->vidioc_default)
+			break;
+		ret = vfd->vidioc_default(file, fh, cmd, arg);
+		break;
+	}
 	} /* switch */
 
 	if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {

diff --git a/trunk/include/media/v4l2-dev.h b/trunk/include/media/v4l2-dev.h
@@ -318,6 +318,10 @@ struct video_device
 	int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
 					struct v4l2_chip_ident *chip);
 
+	/* For other private ioctls */
+	int (*vidioc_default)	       (struct file *file, void *fh,
+					int cmd, void *arg);
+
 
 #ifdef OBSOLETE_OWNER /* to be removed soon */
 /* obsolete -- fops->owner is used instead */