aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx88
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/cx88')
-rw-r--r--drivers/media/pci/cx88/cx88-blackbird.c2
-rw-r--r--drivers/media/pci/cx88/cx88-video.c9
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index 82aa11f526f0..486ca8d5f2a0 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -918,7 +918,7 @@ static int vidioc_g_tuner (struct file *file, void *priv,
918} 918}
919 919
920static int vidioc_s_tuner (struct file *file, void *priv, 920static int vidioc_s_tuner (struct file *file, void *priv,
921 struct v4l2_tuner *t) 921 const struct v4l2_tuner *t)
922{ 922{
923 struct cx88_core *core = ((struct cx8802_fh *)priv)->dev->core; 923 struct cx88_core *core = ((struct cx8802_fh *)priv)->dev->core;
924 924
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 4f10875295e8..ede6f139b5cc 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1289,7 +1289,7 @@ static int vidioc_g_tuner (struct file *file, void *priv,
1289} 1289}
1290 1290
1291static int vidioc_s_tuner (struct file *file, void *priv, 1291static int vidioc_s_tuner (struct file *file, void *priv,
1292 struct v4l2_tuner *t) 1292 const struct v4l2_tuner *t)
1293{ 1293{
1294 struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core; 1294 struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core;
1295 1295
@@ -1409,20 +1409,15 @@ static int radio_g_tuner (struct file *file, void *priv,
1409 return 0; 1409 return 0;
1410} 1410}
1411 1411
1412/* FIXME: Should add a standard for radio */
1413
1414static int radio_s_tuner (struct file *file, void *priv, 1412static int radio_s_tuner (struct file *file, void *priv,
1415 struct v4l2_tuner *t) 1413 const struct v4l2_tuner *t)
1416{ 1414{
1417 struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core; 1415 struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core;
1418 1416
1419 if (0 != t->index) 1417 if (0 != t->index)
1420 return -EINVAL; 1418 return -EINVAL;
1421 if (t->audmode > V4L2_TUNER_MODE_STEREO)
1422 t->audmode = V4L2_TUNER_MODE_STEREO;
1423 1419
1424 call_all(core, tuner, s_tuner, t); 1420 call_all(core, tuner, s_tuner, t);
1425
1426 return 0; 1421 return 0;
1427} 1422}
1428 1423