[media] cx23885: support v4l2_fh and g/s_priority (86dd9831) · Commits · 戴 / test

drivers/media/pci/cx23885/cx23885-417.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1550,6 +1550,7 @@ static int vidioc_queryctrl(struct file file, void priv,

		static int mpeg_open(struct file *file)
		{
		struct video_device *vdev = video_devdata(file);
		struct cx23885_dev *dev = video_drvdata(file);
		struct cx23885_fh *fh;

		@@ -1560,6 +1561,7 @@ static int mpeg_open(struct file *file)
		if (!fh)
		return -ENOMEM;

		v4l2_fh_init(&fh->fh, vdev);
		file->private_data = fh;
		fh->dev = dev;

		@@ -1569,6 +1571,7 @@ static int mpeg_open(struct file *file)
		V4L2_FIELD_INTERLACED,
		sizeof(struct cx23885_buffer),
		fh, NULL);
		v4l2_fh_add(&fh->fh);
		return 0;
		}

		@@ -1601,6 +1604,8 @@ static int mpeg_release(struct file *file)
		videobuf_read_stop(&fh->mpegq);

		videobuf_mmap_free(&fh->mpegq);
		v4l2_fh_del(&fh->fh);
		v4l2_fh_exit(&fh->fh);
		file->private_data = NULL;
		kfree(fh);

+5 −1

Original line number	Diff line number	Diff line
		@@ -883,7 +883,8 @@ static int video_open(struct file *file)
		if (NULL == fh)
		return -ENOMEM;

		file->private_data = fh;
		v4l2_fh_init(&fh->fh, vdev);
		file->private_data = &fh->fh;
		fh->dev = dev;
		fh->radio = radio;
		fh->type = type;
		@@ -905,6 +906,7 @@ static int video_open(struct file *file)
		sizeof(struct cx23885_buffer),
		fh, NULL);

		v4l2_fh_add(&fh->fh);

		dprintk(1, "post videobuf_queue_init()\n");

		@@ -1003,6 +1005,8 @@ static int video_release(struct file *file)
		videobuf_mmap_free(&fh->vidq);
		videobuf_mmap_free(&fh->vbiq);

		v4l2_fh_del(&fh->fh);
		v4l2_fh_exit(&fh->fh);
		file->private_data = NULL;
		kfree(fh);

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		#include <linux/slab.h>

		#include <media/v4l2-device.h>
		#include <media/v4l2-fh.h>
		#include <media/tuner.h>
		#include <media/tveeprom.h>
		#include <media/videobuf-dma-sg.h>
		@@ -147,6 +148,7 @@ struct cx23885_tvnorm {
		};

		struct cx23885_fh {
		struct v4l2_fh fh;
		struct cx23885_dev *dev;
		enum v4l2_buf_type type;
		int radio;