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

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

Merge "media: v4l2-core: 32 bit to 64 bit v4l2-compat changes" into msm-4.14

parents d2c32967 8470ba7f

drivers/media/v4l2-core/v4l2-compat-ioctl32.c

+8 −2
Original line number Diff line number Diff line
@@ -398,7 +398,11 @@ static int get_v4l2_plane32(struct v4l2_plane __user *up, 


	if (copy_in_user(up, up32, 2 * sizeof(__u32)) ||

	    copy_in_user(&up->data_offset, &up32->data_offset,

			 sizeof(up->data_offset)))

			 sizeof(up->data_offset)) ||

	    copy_in_user(up->reserved, up32->reserved,

			 sizeof(up->reserved)) ||

	    copy_in_user(&up->length, &up32->length,

			 sizeof(up->length)))

		return -EFAULT;



	switch (memory) {
@@ -430,7 +434,9 @@ static int put_v4l2_plane32(struct v4l2_plane __user *up, 


	if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||

	    copy_in_user(&up32->data_offset, &up->data_offset,

			 sizeof(up->data_offset)))

			 sizeof(up->data_offset)) ||

	    copy_in_user(up32->reserved, up->reserved,

			 sizeof(up->reserved)))

		return -EFAULT;



	switch (memory) {