From 25a130fda0e04b613658087d3318dfb16f66df8f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 8 Apr 2012 12:59:48 -0300 Subject: [PATCH] --- yaml --- r: 306227 b: refs/heads/master c: 57fb4a4831793de9e8dbdfc8dc5eb8796026d47e h: refs/heads/master i: 306225: cc5bd9b71d41ab6874450e6b43cc2953404f139e 306223: e1ecbb3083c355d941b10f32cffd11247294bd7c v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_v4l2.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 147cdb3d9689..6c3bf33ba40b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e366149b8957f809081e5f0f70d209175127e29 +refs/heads/master: 57fb4a4831793de9e8dbdfc8dc5eb8796026d47e diff --git a/trunk/drivers/media/video/uvc/uvc_v4l2.c b/trunk/drivers/media/video/uvc/uvc_v4l2.c index 111bfff1640d..4ef21e9cb28c 100644 --- a/trunk/drivers/media/video/uvc/uvc_v4l2.c +++ b/trunk/drivers/media/video/uvc/uvc_v4l2.c @@ -1097,7 +1097,8 @@ static int uvc_v4l2_put_xu_mapping(const struct uvc_xu_control_mapping *kp, __put_user(kp->menu_count, &up->menu_count)) return -EFAULT; - __clear_user(up->reserved, sizeof(up->reserved)); + if (__clear_user(up->reserved, sizeof(up->reserved))) + return -EFAULT; if (kp->menu_count == 0) return 0;