aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-06-22 11:52:12 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2013-06-22 11:56:46 +0200
commit70a6cc2d7365549b872f7ba9c3de6a74265fa08a (patch)
tree1ad2ea8dbc772ea9f9cde69bb038785ac0c91c36
parenta38dc19c141c6b777f7044981c82f63cd01639a1 (diff)
wl128x: enable control events.wl128x
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
-rw-r--r--drivers/media/radio/wl128x/fmdrv_v4l2.c10
-rw-r--r--drivers/media/radio/wl128x/fmdrv_v4l2.h1
2 files changed, 8 insertions, 3 deletions
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index 65663647bfd9..4955b880861f 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -105,15 +105,16 @@ static u32 fm_v4l2_fops_poll(struct file *file, struct poll_table_struct *pts)
{
int ret;
struct fmdev *fmdev;
+ u32 rc = v4l2_ctrl_poll(file, pts);
fmdev = video_drvdata(file);
mutex_lock(&fmdev->mutex);
ret = fmc_is_rds_data_available(fmdev, file, pts);
mutex_unlock(&fmdev->mutex);
if (ret < 0)
- return POLLIN | POLLRDNORM;
+ return rc | POLLIN | POLLRDNORM;
- return 0;
+ return rc;
}
/*
@@ -480,7 +481,10 @@ static const struct v4l2_ioctl_ops fm_drv_ioctl_ops = {
.vidioc_s_frequency = fm_v4l2_vidioc_s_freq,
.vidioc_s_hw_freq_seek = fm_v4l2_vidioc_s_hw_freq_seek,
.vidioc_g_modulator = fm_v4l2_vidioc_g_modulator,
- .vidioc_s_modulator = fm_v4l2_vidioc_s_modulator
+ .vidioc_s_modulator = fm_v4l2_vidioc_s_modulator,
+ .vidioc_log_status = v4l2_ctrl_log_status,
+ .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+ .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
};
/* V4L2 RADIO device parent structure */
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.h b/drivers/media/radio/wl128x/fmdrv_v4l2.h
index 66d6f3ef1138..98746609526e 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.h
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.h
@@ -27,6 +27,7 @@
#include <media/v4l2-common.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-fh.h>
+#include <media/v4l2-event.h>
int fm_v4l2_init_video_device(struct fmdev *, int);
void *fm_v4l2_deinit_video_device(void);

Privacy Policy