From d61b8325a706c839eccfb300334f7e777eb85f8a Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Sun, 24 Jun 2012 06:33:26 -0300 Subject: [PATCH] --- yaml --- r: 331146 b: refs/heads/master c: b6ba418ef42010725c7794c64c653e5df48cd31f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/sh_vou.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d510fc5ef3d2..ca227fa05dce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a3ca5f551a99281e50cc974ab48329c1261f88b +refs/heads/master: b6ba418ef42010725c7794c64c653e5df48cd31f diff --git a/trunk/drivers/media/platform/sh_vou.c b/trunk/drivers/media/platform/sh_vou.c index ba3de3e02d47..85fd312f0a82 100644 --- a/trunk/drivers/media/platform/sh_vou.c +++ b/trunk/drivers/media/platform/sh_vou.c @@ -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; @@ -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;