camera: rockchip: camsys v0.0x21.0xa

[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 109f687d1cbdf6790a1bd7b97649d4219bba6890..dd94c675bcab5c258e7020275e76993bef8e8e02 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -348,7 +348,7 @@ struct v4l2_buffer32 {
                __s32           fd;
        } m;
        __u32                   length;
-       __u32                   reserved2;
+       __u32                   config_store;
        __u32                   reserved;
 };
 
@@ -509,7 +509,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;
@@ -626,7 +626,7 @@ static inline int put_v4l2_input32(struct v4l2_input *kp, struct v4l2_input32 __
 }
 
 struct v4l2_ext_controls32 {
-       __u32 ctrl_class;
+       __u32 which;
        __u32 count;
        __u32 error_idx;
        __u32 reserved[2];
@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
        compat_caddr_t p;
 
        if (!access_ok(VERIFY_READ, up, sizeof(struct v4l2_ext_controls32)) ||
-               get_user(kp->ctrl_class, &up->ctrl_class) ||
+               get_user(kp->which, &up->which) ||
                get_user(kp->count, &up->count) ||
                get_user(kp->error_idx, &up->error_idx) ||
                copy_from_user(kp->reserved, up->reserved,
@@ -719,7 +719,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
        compat_caddr_t p;
 
        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_ext_controls32)) ||
-               put_user(kp->ctrl_class, &up->ctrl_class) ||
+               put_user(kp->which, &up->which) ||
                put_user(kp->count, &up->count) ||
                put_user(kp->error_idx, &up->error_idx) ||
                copy_to_user(up->reserved, kp->reserved, sizeof(up->reserved)))