mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 12:25:00 -04:00
Merge "media: v4l2-core: guard code against ABI breakage"
This commit is contained in:
commit
d4cf41dc2e
2 changed files with 2 additions and 2 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue