summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/uvc/uvc_ctrl.c
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2019-04-01 20:38:05 +1030
committerJoel Stanley <joel@jms.id.au>2019-04-01 20:38:09 +1030
commit1fd5e60554e7194f8adc526e985714b9fc25c78d (patch)
tree1cc6b5d9cae4b5b99770009eabeb15ea0059ef0a /drivers/media/usb/uvc/uvc_ctrl.c
parentc8733f5abd0656acfef17d462e72ef105db9924d (diff)
parent1f6f316a537d4310747b08f89fb32565317b288b (diff)
downloadblackbird-obmc-linux-1fd5e60554e7194f8adc526e985714b9fc25c78d.tar.gz
blackbird-obmc-linux-1fd5e60554e7194f8adc526e985714b9fc25c78d.zip
Merge tag 'v5.0.5' into dev-5.0
This is the 5.0.5 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/media/usb/uvc/uvc_ctrl.c')
-rw-r--r--drivers/media/usb/uvc/uvc_ctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index d45415cbe6e7..14cff91b7aea 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1212,7 +1212,7 @@ static void uvc_ctrl_fill_event(struct uvc_video_chain *chain,
__uvc_query_v4l2_ctrl(chain, ctrl, mapping, &v4l2_ctrl);
- memset(ev->reserved, 0, sizeof(ev->reserved));
+ memset(ev, 0, sizeof(*ev));
ev->type = V4L2_EVENT_CTRL;
ev->id = v4l2_ctrl.id;
ev->u.ctrl.value = value;
OpenPOWER on IntegriCloud