CHROMIUM: videodev2.h: rename reserved2 to config_store in v4l2_buffer.

[firefly-linux-kernel-4.4.55.git] / drivers / media / v4l2-core / v4l2-compat-ioctl32.c

diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
index 019644ff627d775f7f4b67e29b46baab9dadabbf..7f6f927cb98e3b2a61a1fafeb6ab55c3136b7acd 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -347,7 +347,7 @@ struct v4l2_buffer32 {
                __s32           fd;
        } m;
        __u32                   length;
-       __u32                   reserved2;
+       __u32                   config_store;
        __u32                   reserved;
 };
 
@@ -508,7 +508,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
                put_user(kp->timestamp.tv_usec, &up->timestamp.tv_usec) ||
                copy_to_user(&up->timecode, &kp->timecode, sizeof(struct v4l2_timecode)) ||
                put_user(kp->sequence, &up->sequence) ||
-               put_user(kp->reserved2, &up->reserved2) ||
+               put_user(kp->config_store, &up->config_store) ||
                put_user(kp->reserved, &up->reserved) ||
                put_user(kp->length, &up->length))
                        return -EFAULT;