diff options
| author | YoungJun Cho <yj44.cho@samsung.com> | 2013-06-24 15:34:21 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-04-16 21:36:36 +0900 |
| commit | 284fa06ef057dbeeb557a620a9d664b548d050a3 (patch) | |
| tree | eff2c4105471611f253a2946542b74908cd97d5c /drivers | |
| parent | 0fbd9e6d8459997c75feaa8bd1cd4c86a718eb30 (diff) | |
| download | linux-3.10-284fa06ef057dbeeb557a620a9d664b548d050a3.tar.gz linux-3.10-284fa06ef057dbeeb557a620a9d664b548d050a3.tar.bz2 linux-3.10-284fa06ef057dbeeb557a620a9d664b548d050a3.zip | |
drm/prime: fix to check return of dma_map_sg in prime helper
The dma_map_sg(), in map_dma_buf callback operation of prime helper,
can return 0 when it fails to map, so it needs to release related
resources.
Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_prime.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 89b5ab28c34..0ff6e103d14 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -74,8 +74,13 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, sgt = obj->dev->driver->gem_prime_get_sg_table(obj); - if (!IS_ERR_OR_NULL(sgt)) - dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir); + if (!IS_ERR_OR_NULL(sgt)) { + if (!dma_map_sg(attach->dev, sgt->sgl, sgt->nents, dir)) { + sg_free_table(sgt); + kfree(sgt); + sgt = ERR_PTR(-ENOMEM); + } + } mutex_unlock(&obj->dev->struct_mutex); return sgt; |