Merge branch 'drm-docs' of ssh://people.freedesktop.org/~danvet/drm into drm-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_gem.c

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 2136052ccee12ff9537a4aff8f2c0812a6ffaa8d..9909bef5980045e3ba5eba0ec35187f4e2bbf0cf 100644 (file)
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -744,7 +744,9 @@ drm_gem_object_release(struct drm_gem_object *obj)
        WARN_ON(obj->dma_buf);
 
        if (obj->filp)
-           fput(obj->filp);
+               fput(obj->filp);
+
+       drm_gem_free_mmap_offset(obj);
 }
 EXPORT_SYMBOL(drm_gem_object_release);
 
@@ -837,7 +839,7 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
        vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
        vma->vm_ops = dev->driver->gem_vm_ops;
        vma->vm_private_data = obj;
-       vma->vm_page_prot =  pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+       vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
 
        /* Take a ref for this mapping of the object, so that the fault
         * handler can dereference the mmap offset's pointer to the object.
@@ -873,7 +875,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
        struct drm_device *dev = priv->minor->dev;
        struct drm_gem_object *obj;
        struct drm_vma_offset_node *node;
-       int ret = 0;
+       int ret;
 
        if (drm_device_is_unplugged(dev))
                return -ENODEV;