These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / bochs / bochs_mm.c

diff --git a/kernel/drivers/gpu/drm/bochs/bochs_mm.c b/kernel/drivers/gpu/drm/bochs/bochs_mm.c
index 66286ff..f69e6bf 100644 (file)
--- a/kernel/drivers/gpu/drm/bochs/bochs_mm.c
+++ b/kernel/drivers/gpu/drm/bochs/bochs_mm.c
@@ -454,25 +454,17 @@ int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,
                           uint32_t handle, uint64_t *offset)
 {
        struct drm_gem_object *obj;
-       int ret;
        struct bochs_bo *bo;
 
-       mutex_lock(&dev->struct_mutex);
        obj = drm_gem_object_lookup(dev, file, handle);
-       if (obj == NULL) {
-               ret = -ENOENT;
-               goto out_unlock;
-       }
+       if (obj == NULL)
+               return -ENOENT;
 
        bo = gem_to_bochs_bo(obj);
        *offset = bochs_bo_mmap_offset(bo);
 
-       drm_gem_object_unreference(obj);
-       ret = 0;
-out_unlock:
-       mutex_unlock(&dev->struct_mutex);
-       return ret;
-
+       drm_gem_object_unreference_unlocked(obj);
+       return 0;
 }
 
 /* ---------------------------------------------------------------------- */