1 files changed, 9 insertions, 0 deletions

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 2dee93892ea2..1efcacbed01a 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -27,11 +27,13 @@
 struct v4l2_ioctl_callbacks;
 struct video_device;
 struct v4l2_device;
+struct v4l2_ctrl_handler;
 
 /* Flag to mark the video_device struct as registered.
    Drivers can clear this flag if they want to block all future
    device access. It is cleared by video_unregister_device. */
 #define V4L2_FL_REGISTERED      (0)
+#define V4L2_FL_USES_V4L2_FH    (1)
 
 struct v4l2_file_operations {
         struct module *owner;
@@ -66,6 +68,9 @@ struct video_device
         struct device *parent;          /* device parent */
         struct v4l2_device *v4l2_dev;   /* v4l2_device parent */
 
+        /* Control handler associated with this device node. May be NULL. */
+        struct v4l2_ctrl_handler *ctrl_handler;
+
         /* device info */
         char name[32];
         int vfl_type;
@@ -77,6 +82,10 @@ struct video_device
         /* attribute to differentiate multiple indices on one physical device */
         int index;
 
+        /* V4L2 file handles */
+        spinlock_t              fh_lock; /* Lock for all v4l2_fhs */
+        struct list_head        fh_list; /* List of struct v4l2_fh */
+
         int debug;                      /* Activates debug level*/
 
         /* Video standard vars */