The prime_mmap was removed in a later review change, and the kfree
needs to use obj because shmem is initialized later on.

Signed-off-by: Eric Anholt <[email protected]>
---

With these changes to Noralf's patch, it's:

Tested-by: Eric Anholt <[email protected]>

 drivers/gpu/drm/drm_gem_shmem_helper.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c 
b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 7471856d34ac..a0f9df8a6721 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -31,7 +31,6 @@ static const struct drm_gem_object_funcs drm_gem_shmem_funcs 
= {
        .get_sg_table = drm_gem_shmem_get_sg_table,
        .vmap = drm_gem_shmem_vmap,
        .vunmap = drm_gem_shmem_vunmap,
-       .prime_mmap = drm_gem_shmem_prime_mmap,
        .vm_ops = &drm_gem_shmem_vm_ops,
 };
 
@@ -81,7 +80,7 @@ struct drm_gem_shmem_object *drm_gem_shmem_create(struct 
drm_device *dev, size_t
 err_release:
        drm_gem_object_release(obj);
 err_free:
-       kfree(shmem);
+       kfree(obj);
 
        return ERR_PTR(ret);
 }
-- 
2.20.0.rc1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to