1 files changed, 50 insertions, 0 deletions

diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 2ceaa152a450..0eeceae50329 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -26,6 +26,8 @@
 #endif
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-fh.h>
+#include <media/v4l2-event.h>
 #include <media/v4l2-chip-ident.h>
 
 #define dbgarg(cmd, fmt, arg...) \
@@ -1951,7 +1953,55 @@ static long __video_do_ioctl(struct file *file,
                 }
                 break;
         }
+        case VIDIOC_DQEVENT:
+        {
+                struct v4l2_event *ev = arg;
+
+                if (!ops->vidioc_subscribe_event)
+                        break;
+
+                ret = v4l2_event_dequeue(fh, ev, file->f_flags & O_NONBLOCK);
+                if (ret < 0) {
+                        dbgarg(cmd, "no pending events?");
+                        break;
+                }
+                dbgarg(cmd,
+                       "pending=%d, type=0x%8.8x, sequence=%d, "
+                       "timestamp=%lu.%9.9lu ",
+                       ev->pending, ev->type, ev->sequence,
+                       ev->timestamp.tv_sec, ev->timestamp.tv_nsec);
+                break;
+        }
+        case VIDIOC_SUBSCRIBE_EVENT:
+        {
+                struct v4l2_event_subscription *sub = arg;
 
+                if (!ops->vidioc_subscribe_event)
+                        break;
+
+                ret = ops->vidioc_subscribe_event(fh, sub);
+                if (ret < 0) {
+                        dbgarg(cmd, "failed, ret=%ld", ret);
+                        break;
+                }
+                dbgarg(cmd, "type=0x%8.8x", sub->type);
+                break;
+        }
+        case VIDIOC_UNSUBSCRIBE_EVENT:
+        {
+                struct v4l2_event_subscription *sub = arg;
+
+                if (!ops->vidioc_unsubscribe_event)
+                        break;
+
+                ret = ops->vidioc_unsubscribe_event(fh, sub);
+                if (ret < 0) {
+                        dbgarg(cmd, "failed, ret=%ld", ret);
+                        break;
+                }
+                dbgarg(cmd, "type=0x%8.8x", sub->type);
+                break;
+        }
         default:
         {
                 if (!ops->vidioc_default)