1 files changed, 11 insertions, 25 deletions

diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 35cc526e6c93..96c4a17e4280 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -205,19 +205,21 @@ static u32 omap_vout_uservirt_to_phys(u32 virtp)
         struct vm_area_struct *vma;
         struct mm_struct *mm = current->mm;
 
-        vma = find_vma(mm, virtp);
         /* For kernel direct-mapped memory, take the easy way */
-        if (virtp >= PAGE_OFFSET) {
-                physp = virt_to_phys((void *) virtp);
-        } else if (vma && (vma->vm_flags & VM_IO) && vma->vm_pgoff) {
+        if (virtp >= PAGE_OFFSET)
+                return virt_to_phys((void *) virtp);
+
+        down_read(&current->mm->mmap_sem);
+        vma = find_vma(mm, virtp);
+        if (vma && (vma->vm_flags & VM_IO) && vma->vm_pgoff) {
                 /* this will catch, kernel-allocated, mmaped-to-usermode
                    addresses */
                 physp = (vma->vm_pgoff << PAGE_SHIFT) + (virtp - vma->vm_start);
+                up_read(&current->mm->mmap_sem);
         } else {
                 /* otherwise, use get_user_pages() for general userland pages */
                 int res, nr_pages = 1;
                 struct page *pages;
-                down_read(&current->mm->mmap_sem);
 
                 res = get_user_pages(current, current->mm, virtp, nr_pages, 1,
                                 0, &pages, NULL);
@@ -595,7 +597,7 @@ static void omap_vout_isr(void *arg, unsigned int irqstatus)
                 return;
 
         spin_lock(&vout->vbq_lock);
-        do_gettimeofday(&timevalue);
+        v4l2_get_timestamp(&timevalue);
 
         switch (cur_display->type) {
         case OMAP_DISPLAY_TYPE_DSI:
@@ -1230,21 +1232,6 @@ static int vidioc_s_fmt_vid_overlay(struct file *file, void *fh,
         return ret;
 }
 
-static int vidioc_enum_fmt_vid_overlay(struct file *file, void *fh,
-                        struct v4l2_fmtdesc *fmt)
-{
-        int index = fmt->index;
-
-        if (index >= NUM_OUTPUT_FORMATS)
-                return -EINVAL;
-
-        fmt->flags = omap_formats[index].flags;
-        strlcpy(fmt->description, omap_formats[index].description,
-                        sizeof(fmt->description));
-        fmt->pixelformat = omap_formats[index].pixelformat;
-        return 0;
-}
-
 static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh,
                         struct v4l2_format *f)
 {
@@ -1858,10 +1845,9 @@ static const struct v4l2_ioctl_ops vout_ioctl_ops = {
         .vidioc_s_fbuf                          = vidioc_s_fbuf,
         .vidioc_g_fbuf                          = vidioc_g_fbuf,
         .vidioc_s_ctrl                          = vidioc_s_ctrl,
-        .vidioc_try_fmt_vid_overlay             = vidioc_try_fmt_vid_overlay,
-        .vidioc_s_fmt_vid_overlay               = vidioc_s_fmt_vid_overlay,
-        .vidioc_enum_fmt_vid_overlay            = vidioc_enum_fmt_vid_overlay,
-        .vidioc_g_fmt_vid_overlay               = vidioc_g_fmt_vid_overlay,
+        .vidioc_try_fmt_vid_out_overlay         = vidioc_try_fmt_vid_overlay,
+        .vidioc_s_fmt_vid_out_overlay           = vidioc_s_fmt_vid_overlay,
+        .vidioc_g_fmt_vid_out_overlay           = vidioc_g_fmt_vid_overlay,
         .vidioc_cropcap                         = vidioc_cropcap,
         .vidioc_g_crop                          = vidioc_g_crop,
         .vidioc_s_crop                          = vidioc_s_crop,