3 files changed, 5 insertions, 10 deletions

diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
index c30f3e1d0efc..460e22dee36d 100644
--- a/drivers/base/dma-buf.c
+++ b/drivers/base/dma-buf.c
@@ -460,8 +460,7 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma,
         if (vma->vm_file)
                 fput(vma->vm_file);
 
-        vma->vm_file = dmabuf->file;
-        get_file(vma->vm_file);
+        vma->vm_file = get_file(dmabuf->file);
 
         vma->vm_pgoff = pgoff;
 
diff --git a/drivers/staging/omapdrm/omap_gem.c b/drivers/staging/omapdrm/omap_gem.c
index 3a0d035a9e03..2a6bb7f9ee68 100644
--- a/drivers/staging/omapdrm/omap_gem.c
+++ b/drivers/staging/omapdrm/omap_gem.c
@@ -566,9 +566,8 @@ int omap_gem_mmap_obj(struct drm_gem_object *obj,
                  * in particular in the case of mmap'd dmabufs)
                  */
                 fput(vma->vm_file);
-                get_file(obj->filp);
                 vma->vm_pgoff = 0;
-                vma->vm_file  = obj->filp;
+                vma->vm_file  = get_file(obj->filp);
 
                 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
         }
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 71d95cfbabec..c7561f29d894 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1163,10 +1163,8 @@ ssize_t redirected_tty_write(struct file *file, const char __user *buf,
         struct file *p = NULL;
 
         spin_lock(&redirect_lock);
-        if (redirect) {
-                get_file(redirect);
-                p = redirect;
-        }
+        if (redirect)
+                p = get_file(redirect);
         spin_unlock(&redirect_lock);
 
         if (p) {
@@ -2246,8 +2244,7 @@ static int tioccons(struct file *file)
                 spin_unlock(&redirect_lock);
                 return -EBUSY;
         }
-        get_file(file);
-        redirect = file;
+        redirect = get_file(file);
         spin_unlock(&redirect_lock);
         return 0;
 }