aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-02-03 07:51:59 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 08:33:10 -0400
commit0dc5d82dcdfcec4d195b70fe8c0a13e5e6dd8d5a (patch)
tree122b283abb67615ecac2fdecdfee2ea22f642677
parent268d06bb765da0bdd17344a6877f5898713a7cbb (diff)
[media] radio-sf16fmi: add control event and prio support
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/radio/radio-sf16fmi.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index b058f36669ee..9e712c8310f2 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -28,6 +28,7 @@
28#include <media/v4l2-device.h> 28#include <media/v4l2-device.h>
29#include <media/v4l2-ioctl.h> 29#include <media/v4l2-ioctl.h>
30#include <media/v4l2-ctrls.h> 30#include <media/v4l2-ctrls.h>
31#include <media/v4l2-event.h>
31#include "lm7000.h" 32#include "lm7000.h"
32 33
33MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood"); 34MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood");
@@ -202,6 +203,9 @@ static const struct v4l2_ctrl_ops fmi_ctrl_ops = {
202 203
203static const struct v4l2_file_operations fmi_fops = { 204static const struct v4l2_file_operations fmi_fops = {
204 .owner = THIS_MODULE, 205 .owner = THIS_MODULE,
206 .open = v4l2_fh_open,
207 .release = v4l2_fh_release,
208 .poll = v4l2_ctrl_poll,
205 .unlocked_ioctl = video_ioctl2, 209 .unlocked_ioctl = video_ioctl2,
206}; 210};
207 211
@@ -211,6 +215,9 @@ static const struct v4l2_ioctl_ops fmi_ioctl_ops = {
211 .vidioc_s_tuner = vidioc_s_tuner, 215 .vidioc_s_tuner = vidioc_s_tuner,
212 .vidioc_g_frequency = vidioc_g_frequency, 216 .vidioc_g_frequency = vidioc_g_frequency,
213 .vidioc_s_frequency = vidioc_s_frequency, 217 .vidioc_s_frequency = vidioc_s_frequency,
218 .vidioc_log_status = v4l2_ctrl_log_status,
219 .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
220 .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
214}; 221};
215 222
216/* ladis: this is my card. does any other types exist? */ 223/* ladis: this is my card. does any other types exist? */
@@ -330,6 +337,7 @@ static int __init fmi_init(void)
330 fmi->vdev.fops = &fmi_fops; 337 fmi->vdev.fops = &fmi_fops;
331 fmi->vdev.ioctl_ops = &fmi_ioctl_ops; 338 fmi->vdev.ioctl_ops = &fmi_ioctl_ops;
332 fmi->vdev.release = video_device_release_empty; 339 fmi->vdev.release = video_device_release_empty;
340 set_bit(V4L2_FL_USE_FH_PRIO, &fmi->vdev.flags);
333 video_set_drvdata(&fmi->vdev, fmi); 341 video_set_drvdata(&fmi->vdev, fmi);
334 342
335 mutex_init(&fmi->lock); 343 mutex_init(&fmi->lock);