From ace281e8ab62e026b95c413db5f3c6beed42b829 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 22 Mar 2012 09:30:56 +0300 Subject: drm/udl: unlock before returning in udl_gem_mmap() If we hit an error here, then we should unlock and unreference obj before returning. Signed-off-by: Dan Carpenter Signed-off-by: Dave Airlie --- drivers/gpu/drm/udl/udl_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/drm/udl/udl_gem.c') diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 40efd32f7dce..d9609e2a4d8a 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c @@ -234,7 +234,7 @@ int udl_gem_mmap(struct drm_file *file, struct drm_device *dev, ret = udl_gem_get_pages(gobj, GFP_KERNEL); if (ret) - return ret; + goto out; if (!gobj->base.map_list.map) { ret = drm_gem_create_mmap_offset(obj); if (ret) -- cgit v1.2.3 From 1c780f2cfec8b533b9cfda77209b4e3e7adaddbf Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 29 May 2012 13:47:59 +0100 Subject: drm/udl: remove unused variables. These two variables were not required after new API was introduced. Signed-off-by: Dave Airlie --- drivers/gpu/drm/udl/udl_gem.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/gpu/drm/udl/udl_gem.c') diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index d9609e2a4d8a..97acc9c6c95b 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c @@ -257,8 +257,6 @@ static int udl_prime_create(struct drm_device *dev, { struct udl_gem_object *obj; int npages; - int i; - struct scatterlist *iter; npages = size / PAGE_SIZE; -- cgit v1.2.3