Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 331146
b: refs/heads/master
c: b6ba418
h: refs/heads/master
v: v3
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Sep 27, 2012
1 parent 1d300cc commit d61b832
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6a3ca5f551a99281e50cc974ab48329c1261f88b
refs/heads/master: b6ba418ef42010725c7794c64c653e5df48cd31f
2 changes: 2 additions & 0 deletions trunk/drivers/media/platform/sh_vou.c
Original file line number Diff line number Diff line change
Expand Up @@ -1224,6 +1224,7 @@ static int sh_vou_release(struct file *file)

static int sh_vou_mmap(struct file *file, struct vm_area_struct *vma)
{
struct video_device *vdev = video_devdata(file);
struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
struct sh_vou_file *vou_file = file->private_data;
int ret;
Expand All @@ -1239,6 +1240,7 @@ static int sh_vou_mmap(struct file *file, struct vm_area_struct *vma)

static unsigned int sh_vou_poll(struct file *file, poll_table *wait)
{
struct video_device *vdev = video_devdata(file);
struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
struct sh_vou_file *vou_file = file->private_data;
unsigned int res;
Expand Down

0 comments on commit d61b832

Please sign in to comment.