aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c4
-rw-r--r--drivers/media/video/saa7134/saa7134-empress.c4
-rw-r--r--drivers/media/video/videodev.c1
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 9fa1ddbe3fd8..6e945de1f20a 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -805,10 +805,14 @@ static int mpeg_do_ioctl(struct inode *inode, struct file *file,
805 { 805 {
806 struct v4l2_mpeg_compression *f = arg; 806 struct v4l2_mpeg_compression *f = arg;
807 807
808 printk(KERN_WARNING "VIDIOC_G_MPEGCOMP is obsolete. "
809 "Replace with VIDIOC_G_EXT_CTRLS!");
808 memcpy(f,&default_mpeg_params,sizeof(*f)); 810 memcpy(f,&default_mpeg_params,sizeof(*f));
809 return 0; 811 return 0;
810 } 812 }
811 case VIDIOC_S_MPEGCOMP: 813 case VIDIOC_S_MPEGCOMP:
814 printk(KERN_WARNING "VIDIOC_S_MPEGCOMP is obsolete. "
815 "Replace with VIDIOC_S_EXT_CTRLS!");
812 return 0; 816 return 0;
813 case VIDIOC_G_EXT_CTRLS: 817 case VIDIOC_G_EXT_CTRLS:
814 { 818 {
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index bc743b9253fd..65d044086ce9 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -281,10 +281,14 @@ static int ts_do_ioctl(struct inode *inode, struct file *file,
281 return saa7134_common_ioctl(dev, cmd, arg); 281 return saa7134_common_ioctl(dev, cmd, arg);
282 282
283 case VIDIOC_S_MPEGCOMP: 283 case VIDIOC_S_MPEGCOMP:
284 printk(KERN_WARNING "VIDIOC_S_MPEGCOMP is obsolete. "
285 "Replace with VIDIOC_S_EXT_CTRLS!");
284 saa7134_i2c_call_clients(dev, VIDIOC_S_MPEGCOMP, arg); 286 saa7134_i2c_call_clients(dev, VIDIOC_S_MPEGCOMP, arg);
285 ts_init_encoder(dev); 287 ts_init_encoder(dev);
286 return 0; 288 return 0;
287 case VIDIOC_G_MPEGCOMP: 289 case VIDIOC_G_MPEGCOMP:
290 printk(KERN_WARNING "VIDIOC_G_MPEGCOMP is obsolete. "
291 "Replace with VIDIOC_G_EXT_CTRLS!");
288 saa7134_i2c_call_clients(dev, VIDIOC_G_MPEGCOMP, arg); 292 saa7134_i2c_call_clients(dev, VIDIOC_G_MPEGCOMP, arg);
289 return 0; 293 return 0;
290 case VIDIOC_S_EXT_CTRLS: 294 case VIDIOC_S_EXT_CTRLS:
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 763e178555d0..2dfa7f23d0ca 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -1216,6 +1216,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
1216 case VIDIOC_G_MPEGCOMP: 1216 case VIDIOC_G_MPEGCOMP:
1217 { 1217 {
1218 struct v4l2_mpeg_compression *p=arg; 1218 struct v4l2_mpeg_compression *p=arg;
1219
1219 /*FIXME: Several fields not shown */ 1220 /*FIXME: Several fields not shown */
1220 if (!vfd->vidioc_g_mpegcomp) 1221 if (!vfd->vidioc_g_mpegcomp)
1221 break; 1222 break;