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

Commit 8c0d44e2 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

[media] uvcvideo: Replace memcpy with struct assignment 



This kind of memcpy() is error-prone. Its replacement with a struct
assignment is prefered because it's type-safe and much easier to read.

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5d97046a

drivers/media/usb/uvc/uvc_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ static int uvc_ctrl_add_info(struct uvc_device *dev, struct uvc_control *ctrl, 
{

	int ret = 0;



	memcpy(&ctrl->info, info, sizeof(*info));

	ctrl->info = *info;

	INIT_LIST_HEAD(&ctrl->info.mappings);



	/* Allocate an array to save control values (cur, def, max, etc.) */

drivers/media/usb/uvc/uvc_v4l2.c

+3 −3
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static int uvc_v4l2_set_format(struct uvc_streaming *stream, 
		goto done;

	}



	memcpy(&stream->ctrl, &probe, sizeof probe);

	stream->ctrl = probe;

	stream->cur_format = format;

	stream->cur_frame = frame;
@@ -387,7 +387,7 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming *stream, 
		return -EBUSY;

	}



	memcpy(&probe, &stream->ctrl, sizeof probe);

	probe = stream->ctrl;

	probe.dwFrameInterval =

		uvc_try_frame_interval(stream->cur_frame, interval);
@@ -398,7 +398,7 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming *stream, 
		return ret;

	}



	memcpy(&stream->ctrl, &probe, sizeof probe);

	stream->ctrl = probe;

	mutex_unlock(&stream->mutex);



	/* Return the actual frame period. */