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

Commit d4cf41dc authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "media: v4l2-core: guard code against ABI breakage"

parents 5f14f07b b6f9c071

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

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type) 
		if (is_vid && is_tx && ops->vidioc_g_fmt_meta_out)

			return 0;

		break;

#ifdef CONFIG_I2C_RTC6226_QCA

#if IS_ENABLED(CONFIG_I2C_RTC6226_QCA)

	case V4L2_BUF_TYPE_PRIVATE:

		if (ops->vidioc_g_fmt_type_private)

			return 0;

include/media/v4l2-ioctl.h

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

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

				     struct v4l2_format *f);

#ifdef CONFIG_I2C_RTC6226_QCA

#if IS_ENABLED(CONFIG_I2C_RTC6226_QCA)

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

					struct v4l2_format *f);

#endif