[media] em28xx: add support for control events

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index c67ff8d96d22dd68b7da772804b53d14faece8b8..acdb4340399f42bd002d6cb4be6cd8ae7936e1d1 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -40,6 +40,7 @@
 #include "em28xx.h"
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-event.h>
 #include <media/v4l2-chip-ident.h>
 #include <media/msp3400.h>
 #include <media/tuner.h>
@@ -1927,24 +1928,33 @@ em28xx_v4l2_read(struct file *filp, char __user *buf, size_t count,
 static unsigned int em28xx_poll(struct file *filp, poll_table *wait)
 {
        struct em28xx_fh *fh = filp->private_data;
+       unsigned long req_events = poll_requested_events(wait);
        struct em28xx *dev = fh->dev;
+       unsigned int res = 0;
        int rc;
 
        rc = check_dev(dev);
        if (rc < 0)
-               return rc;
-
-       if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-               if (!res_get(fh, EM28XX_RESOURCE_VIDEO))
-                       return POLLERR;
-               return videobuf_poll_stream(filp, &fh->vb_vidq, wait);
-       } else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-               if (!res_get(fh, EM28XX_RESOURCE_VBI))
-                       return POLLERR;
-               return videobuf_poll_stream(filp, &fh->vb_vbiq, wait);
-       } else {
-               return POLLERR;
+               return DEFAULT_POLLMASK;
+
+       if (v4l2_event_pending(&fh->fh))
+               res = POLLPRI;
+       else if (req_events & POLLPRI)
+               poll_wait(filp, &fh->fh.wait, wait);
+
+       if (req_events & (POLLIN | POLLRDNORM)) {
+               if (fh->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                       if (!res_get(fh, EM28XX_RESOURCE_VIDEO))
+                               return res | POLLERR;
+                       return videobuf_poll_stream(filp, &fh->vb_vidq, wait);
+               }
+               if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+                       if (!res_get(fh, EM28XX_RESOURCE_VBI))
+                               return res | POLLERR;
+                       return res | videobuf_poll_stream(filp, &fh->vb_vbiq, wait);
+               }
        }
+       return res;
 }
 
 static unsigned int em28xx_v4l2_poll(struct file *filp, poll_table *wait)
@@ -2032,6 +2042,8 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
        .vidioc_s_tuner             = vidioc_s_tuner,
        .vidioc_g_frequency         = vidioc_g_frequency,
        .vidioc_s_frequency         = vidioc_s_frequency,
+       .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+       .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .vidioc_g_register          = vidioc_g_register,
        .vidioc_s_register          = vidioc_s_register,
@@ -2061,6 +2073,8 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = {
        .vidioc_s_tuner       = radio_s_tuner,
        .vidioc_g_frequency   = vidioc_g_frequency,
        .vidioc_s_frequency   = vidioc_s_frequency,
+       .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+       .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        .vidioc_g_register    = vidioc_g_register,
        .vidioc_s_register    = vidioc_s_register,