diff options
Diffstat (limited to 'drivers/media/video/v4l1-compat.c')
| -rw-r--r-- | drivers/media/video/v4l1-compat.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c index b0d4bcb027d0..70ecbdb80277 100644 --- a/drivers/media/video/v4l1-compat.c +++ b/drivers/media/video/v4l1-compat.c | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * $Id: v4l1-compat.c,v 1.9 2005/06/12 04:19:19 mchehab Exp $ | ||
| 3 | * | ||
| 2 | * Video for Linux Two | 4 | * Video for Linux Two |
| 3 | * Backward Compatibility Layer | 5 | * Backward Compatibility Layer |
| 4 | * | 6 | * |
| @@ -15,14 +17,11 @@ | |||
| 15 | * | 17 | * |
| 16 | */ | 18 | */ |
| 17 | 19 | ||
| 18 | #ifndef __KERNEL__ | ||
| 19 | #define __KERNEL__ | ||
| 20 | #endif | ||
| 21 | |||
| 22 | #include <linux/config.h> | 20 | #include <linux/config.h> |
| 23 | 21 | ||
| 24 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 25 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/moduleparam.h> | ||
| 26 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 28 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| @@ -787,12 +786,15 @@ v4l_compat_translate_ioctl(struct inode *inode, | |||
| 787 | !(qctrl2.flags & V4L2_CTRL_FLAG_DISABLED)) | 786 | !(qctrl2.flags & V4L2_CTRL_FLAG_DISABLED)) |
| 788 | aud->step = qctrl2.step; | 787 | aud->step = qctrl2.step; |
| 789 | aud->mode = 0; | 788 | aud->mode = 0; |
| 789 | |||
| 790 | memset(&tun2,0,sizeof(tun2)); | ||
| 790 | err = drv(inode, file, VIDIOC_G_TUNER, &tun2); | 791 | err = drv(inode, file, VIDIOC_G_TUNER, &tun2); |
| 791 | if (err < 0) { | 792 | if (err < 0) { |
| 792 | dprintk("VIDIOCGAUDIO / VIDIOC_G_TUNER: %d\n",err); | 793 | dprintk("VIDIOCGAUDIO / VIDIOC_G_TUNER: %d\n",err); |
| 793 | err = 0; | 794 | err = 0; |
| 794 | break; | 795 | break; |
| 795 | } | 796 | } |
| 797 | |||
| 796 | if (tun2.rxsubchans & V4L2_TUNER_SUB_LANG2) | 798 | if (tun2.rxsubchans & V4L2_TUNER_SUB_LANG2) |
| 797 | aud->mode = VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; | 799 | aud->mode = VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; |
| 798 | else if (tun2.rxsubchans & V4L2_TUNER_SUB_STEREO) | 800 | else if (tun2.rxsubchans & V4L2_TUNER_SUB_STEREO) |
