summaryrefslogtreecommitdiffstats
path: root/drivers/media/radio
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-01-25 16:48:13 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:58 -0200
commita0c05ab9762560cf12733181d19b6529bb7231d2 (patch)
tree5bb680851607d1f7ad5145fcd4ae442f65c7c9a3 /drivers/media/radio
parent676b0ac7aa409d326d92ca46c65bba20bebb3c1c (diff)
downloadkernel-crypto-a0c05ab9762560cf12733181d19b6529bb7231d2.tar.gz
kernel-crypto-a0c05ab9762560cf12733181d19b6529bb7231d2.tar.xz
kernel-crypto-a0c05ab9762560cf12733181d19b6529bb7231d2.zip
V4L/DVB (5152): Implements VIDIOC_[S|G]_INPUT on radio-aztech/radio-maxiradio
fmtools use VIDIOCSTUNER, with, in turn, calls VIDIOC_S_INPUT on v4l1-compat. So, those ioctls are required for V4L1 to work properly. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r--drivers/media/radio/radio-aztech.c16
-rw-r--r--drivers/media/radio/radio-maxiradio.c16
2 files changed, 32 insertions, 0 deletions
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 9bf25820169..9f1addae692 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -237,6 +237,20 @@ static int vidioc_g_audio (struct file *file, void *priv,
return 0;
}
+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
+{
+ *i = 0;
+ return 0;
+}
+
+static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
+{
+ if (i != 0)
+ return -EINVAL;
+ return 0;
+}
+
+
static int vidioc_s_audio (struct file *file, void *priv,
struct v4l2_audio *a)
{
@@ -348,6 +362,8 @@ static struct video_device aztech_radio=
.vidioc_s_tuner = vidioc_s_tuner,
.vidioc_g_audio = vidioc_g_audio,
.vidioc_s_audio = vidioc_s_audio,
+ .vidioc_g_input = vidioc_g_input,
+ .vidioc_s_input = vidioc_s_input,
.vidioc_g_frequency = vidioc_g_frequency,
.vidioc_s_frequency = vidioc_s_frequency,
.vidioc_queryctrl = vidioc_queryctrl,
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 40494dc5b7f..fd2b9d944cd 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -231,6 +231,20 @@ static int vidioc_g_audio (struct file *file, void *priv,
return 0;
}
+static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
+{
+ *i = 0;
+ return 0;
+}
+
+static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
+{
+ if (i != 0)
+ return -EINVAL;
+ return 0;
+}
+
+
static int vidioc_s_audio (struct file *file, void *priv,
struct v4l2_audio *a)
{
@@ -326,6 +340,8 @@ static struct video_device maxiradio_radio =
.vidioc_s_tuner = vidioc_s_tuner,
.vidioc_g_audio = vidioc_g_audio,
.vidioc_s_audio = vidioc_s_audio,
+ .vidioc_g_input = vidioc_g_input,
+ .vidioc_s_input = vidioc_s_input,
.vidioc_g_frequency = vidioc_g_frequency,
.vidioc_s_frequency = vidioc_s_frequency,
.vidioc_queryctrl = vidioc_queryctrl,