Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357204
b: refs/heads/master
c: 5869bb3
h: refs/heads/master
v: v3
  • Loading branch information
Ezequiel Garcia authored and Mauro Carvalho Chehab committed Dec 27, 2012
1 parent 43dc6e2 commit efa2f83
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 8fe392b8fdb93ced86e1661bff91af95ee234cf9
refs/heads/master: 5869bb39f8e1f671746dcb5f070e3b1c38b23e5c
4 changes: 2 additions & 2 deletions trunk/drivers/media/usb/sn9c102/sn9c102_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2827,7 +2827,7 @@ sn9c102_vidioc_querybuf(struct sn9c102_device* cam, void __user * arg)
b.index >= cam->nbuffers || cam->io != IO_MMAP)
return -EINVAL;

memcpy(&b, &cam->frame[b.index].buf, sizeof(b));
b = cam->frame[b.index].buf;

if (cam->frame[b.index].vma_use_count)
b.flags |= V4L2_BUF_FLAG_MAPPED;
Expand Down Expand Up @@ -2930,7 +2930,7 @@ sn9c102_vidioc_dqbuf(struct sn9c102_device* cam, struct file* filp,

f->state = F_UNUSED;

memcpy(&b, &f->buf, sizeof(b));
b = f->buf;
if (f->vma_use_count)
b.flags |= V4L2_BUF_FLAG_MAPPED;

Expand Down

0 comments on commit efa2f83

Please sign in to comment.