Skip to content

Commit

Permalink
[media] uvcvideo: Replace memcpy with struct assignment
Browse files Browse the repository at this point in the history
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: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Ezequiel Garcia authored and Mauro Carvalho Chehab committed Feb 5, 2013
1 parent 5d97046 commit 8c0d44e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/media/usb/uvc/uvc_ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.) */
Expand Down
6 changes: 3 additions & 3 deletions drivers/media/usb/uvc/uvc_v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);

Expand All @@ -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. */
Expand Down

0 comments on commit 8c0d44e

Please sign in to comment.