V4L/DVB (4857): Cleans some ioctl structs before calling V4L2 counterpart (c6aeb111) · Commits · 戴 / test

drivers/media/video/v4l1-compat.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -714,6 +714,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
		case VIDIOCGFREQ: /* get frequency */
		{
		unsigned long *freq = arg;
		memset(&freq2,0,sizeof(freq2));

		freq2.tuner = 0;
		err = drv(inode, file, VIDIOC_G_FREQUENCY, &freq2);
		@@ -726,8 +727,8 @@ v4l_compat_translate_ioctl(struct inode *inode,
		case VIDIOCSFREQ: /* set frequency */
		{
		unsigned long *freq = arg;
		memset(&freq2,0,sizeof(freq2));

		freq2.tuner = 0;
		drv(inode, file, VIDIOC_G_FREQUENCY, &freq2);
		freq2.frequency = *freq;
		err = drv(inode, file, VIDIOC_S_FREQUENCY, &freq2);
		@@ -738,6 +739,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
		case VIDIOCGAUDIO: /* get audio properties/controls */
		{
		struct video_audio *aud = arg;
		memset(&aud2,0,sizeof(aud2));

		err = drv(inode, file, VIDIOC_G_AUDIO, &aud2);
		if (err < 0) {
		@@ -898,6 +900,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
		{
		int *i = arg;

		memset(&buf2,0,sizeof(buf2));
		buf2.index = *i;
		buf2.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
		err = drv(inode, file, VIDIOC_QUERYBUF, &buf2);