Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dfa9abd authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (4399): Fix a typo that caused some compat stuff to not work 



Config option typo:
-#ifdef CONFIG_V4L1_COMPAT
+#ifdef CONFIG_VIDEO_V4L1_COMPAT

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 3cdc0f26

drivers/media/video/cx88/cx88-video.c

+2 −2
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, 
		struct v4l2_format *f = arg;

		return cx8800_try_fmt(dev,fh,f);

	}

#ifdef CONFIG_V4L1_COMPAT

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	/* --- streaming capture ------------------------------------- */

	case VIDIOCGMBUF:

	{
@@ -1584,7 +1584,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, 
		*id = 0;

		return 0;

	}

#ifdef CONFIG_V4L1_COMPAT

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	case VIDIOCSTUNER:

	{

		struct video_tuner *v = arg;

drivers/media/video/saa7134/saa7134-video.c

+1 −1
Original line number Diff line number Diff line
@@ -2087,7 +2087,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, 
		struct v4l2_format *f = arg;

		return saa7134_try_fmt(dev,fh,f);

	}

#ifdef CONFIG_V4L1_COMPAT

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	case VIDIOCGMBUF:

	{

		struct video_mbuf *mbuf = arg;

drivers/media/video/v4l2-common.c

+3 −3
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static char *v4l2_memory_names[] = { 
/* ------------------------------------------------------------------ */

/* debug help functions                                               */



#ifdef CONFIG_V4L1_COMPAT

#ifdef CONFIG_VIDEO_V4L1_COMPAT

static const char *v4l1_ioctls[] = {

	[_IOC_NR(VIDIOCGCAP)]       = "VIDIOCGCAP",

	[_IOC_NR(VIDIOCGCHAN)]      = "VIDIOCGCHAN",
@@ -301,7 +301,7 @@ static const char *v4l2_ioctls[] = { 
#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)



static const char *v4l2_int_ioctls[] = {

#ifdef CONFIG_V4L1_COMPAT

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	[_IOC_NR(DECODER_GET_CAPABILITIES)]    = "DECODER_GET_CAPABILITIES",

	[_IOC_NR(DECODER_GET_STATUS)]          = "DECODER_GET_STATUS",

	[_IOC_NR(DECODER_SET_NORM)]            = "DECODER_SET_NORM",
@@ -367,7 +367,7 @@ void v4l_printk_ioctl(unsigned int cmd) 
		       (_IOC_NR(cmd) < V4L2_INT_IOCTLS) ?

		       v4l2_int_ioctls[_IOC_NR(cmd)] : "UNKNOWN", dir, cmd);

		break;

#ifdef CONFIG_V4L1_COMPAT

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	case 'v':

		printk("v4l1 ioctl %s, dir=%s (0x%08x)\n",

		       (_IOC_NR(cmd) < V4L1_IOCTLS) ?

drivers/media/video/videodev.c

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, 
		ret=vfd->vidioc_overlay(file, fh, *i);

		break;

	}

#ifdef CONFIG_V4L1_COMPAT

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	/* --- streaming capture ------------------------------------- */

	case VIDIOCGMBUF:

	{

drivers/media/video/vivi.c

+2 −2
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p) 
				file->f_flags & O_NONBLOCK));

}



#ifdef CONFIG_V4L1_COMPAT

#ifdef CONFIG_VIDEO_V4L1_COMPAT

static int vidiocgmbuf (struct file *file, void *priv, struct video_mbuf *mbuf)

{

	struct vivi_fh  *fh=priv;
@@ -1328,7 +1328,7 @@ static struct video_device vivi = { 
	.vidioc_s_ctrl        = vidioc_s_ctrl,

	.vidioc_streamon      = vidioc_streamon,

	.vidioc_streamoff     = vidioc_streamoff,

#ifdef CONFIG_V4L1_COMPAT

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	.vidiocgmbuf          = vidiocgmbuf,

#endif

	.tvnorms              = tvnorms,