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

Commit 0b071678 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "v4l2-ioctl: Initialize the dqbuf function pointer"

parents 3d60989c 4e6cc454

drivers/media/radio/radio-iris.c

+8 −0
Original line number Diff line number Diff line
@@ -4102,6 +4102,13 @@ static int iris_vidioc_dqbuf(struct file *file, void *priv, 
	return retval;

}



static int iris_vidioc_g_fmt_type_private(struct file *file, void *priv,

						struct v4l2_format *f)

{

	return 0;



}



static int iris_vidioc_s_hw_freq_seek(struct file *file, void *priv,

					const struct v4l2_hw_freq_seek *seek)

{
@@ -4205,6 +4212,7 @@ static const struct v4l2_ioctl_ops iris_ioctl_ops = { 
	.vidioc_s_frequency           = iris_vidioc_s_frequency,

	.vidioc_s_hw_freq_seek        = iris_vidioc_s_hw_freq_seek,

	.vidioc_dqbuf                 = iris_vidioc_dqbuf,

	.vidioc_g_fmt_type_private    = iris_vidioc_g_fmt_type_private,

	.vidioc_s_ext_ctrls           = iris_vidioc_s_ext_ctrls,

	.vidioc_g_ext_ctrls           = iris_vidioc_g_ext_ctrls,

};

drivers/media/v4l2-core/v4l2-ioctl.c

+4 −0
Original line number Diff line number Diff line
@@ -942,6 +942,10 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type) 
		if (is_vbi && is_tx && ops->vidioc_g_fmt_sliced_vbi_out)

			return 0;

		break;

	case V4L2_BUF_TYPE_PRIVATE:

		if (ops->vidioc_g_fmt_type_private)

			return 0;

		break;

	default:

		break;

	}

include/media/v4l2-ioctl.h

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ struct v4l2_ioctl_ops { 
					   struct v4l2_format *f);

	int (*vidioc_g_fmt_vid_out_mplane)(struct file *file, void *fh,

					   struct v4l2_format *f);



	int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,

					struct v4l2_format *f);

	/* VIDIOC_S_FMT handlers */

	int (*vidioc_s_fmt_vid_cap)    (struct file *file, void *fh,

					struct v4l2_format *f);