mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-29 02:01:21 +00:00
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From ed94add00e290e675c36cef6767d7d1f51a02f28 Mon Sep 17 00:00:00 2001
|
|
From: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Date: Mon, 4 Jan 2016 16:10:24 +0300
|
|
Subject: [PATCH] drm/etnaviv: unlock on error in etnaviv_gem_get_iova()
|
|
|
|
We have to drop a lock before returning -ENOMEM here.
|
|
|
|
Fixes: a8c21a5451d8 ('drm/etnaviv: add initial etnaviv DRM driver')
|
|
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
|
|
index 8d6f859..9f77c3b 100644
|
|
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
|
|
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
|
|
@@ -305,8 +305,10 @@ int etnaviv_gem_get_iova(struct etnaviv_gpu *gpu,
|
|
mapping = etnaviv_gem_get_vram_mapping(etnaviv_obj, NULL);
|
|
if (!mapping) {
|
|
mapping = kzalloc(sizeof(*mapping), GFP_KERNEL);
|
|
- if (!mapping)
|
|
- return -ENOMEM;
|
|
+ if (!mapping) {
|
|
+ ret = -ENOMEM;
|
|
+ goto out;
|
|
+ }
|
|
|
|
INIT_LIST_HEAD(&mapping->scan_node);
|
|
mapping->object = etnaviv_obj;
|
|
--
|
|
2.7.0.rc3
|
|
|