Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 320094
b: refs/heads/master
c: cc831f8
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Jul 6, 2012
1 parent 0e009a1 commit 95d6a02
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7985a90d5bb608be221e135415fa63885981ca3e
refs/heads/master: cc831f843c807ac9050707f7b2c403f9c400a197
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/v4l2-compat-ioctl32.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
get_user(kp->index, &up->index) ||
get_user(kp->type, &up->type) ||
get_user(kp->flags, &up->flags) ||
get_user(kp->memory, &up->memory)
get_user(kp->memory, &up->memory))
return -EFAULT;

if (V4L2_TYPE_IS_OUTPUT(kp->type))
Expand Down Expand Up @@ -471,7 +471,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
put_user(kp->index, &up->index) ||
put_user(kp->type, &up->type) ||
put_user(kp->flags, &up->flags) ||
put_user(kp->memory, &up->memory)
put_user(kp->memory, &up->memory))
return -EFAULT;

if (put_user(kp->bytesused, &up->bytesused) ||
Expand All @@ -481,7 +481,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
copy_to_user(&up->timecode, &kp->timecode, sizeof(struct v4l2_timecode)) ||
put_user(kp->sequence, &up->sequence) ||
put_user(kp->reserved2, &up->reserved2) ||
put_user(kp->reserved, &up->reserved)
put_user(kp->reserved, &up->reserved))
return -EFAULT;

if (V4L2_TYPE_IS_MULTIPLANAR(kp->type)) {
Expand Down

0 comments on commit 95d6a02

Please sign in to comment.