---

yaml --- r: 306227 b: refs/heads/master c: 57fb4a4 h: refs/heads/master i: 306225: cc5bd9b 306223: e1ecbb3 v: v3
git-mirror · May 7, 2012 · 25a130f · 25a130f
1 parent 3d488a1
commit 25a130f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;