aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos/exynos_drm_buf.c
diff options
context:
space:
mode:
authorSeung-Woo Kim <sw0312.kim@samsung.com>2013-07-03 04:09:21 -0400
committerInki Dae <inki.dae@samsung.com>2013-07-04 02:55:37 -0400
commit4bb615c5fbb4f3ea0f197dfe4fb07a9e4ec2a755 (patch)
treea860ecdfcd14058bd2a22b62b0dd86c9db1c0ee5 /drivers/gpu/drm/exynos/exynos_drm_buf.c
parent42ac99a72041a3515bd2b205adb9a239b49c6741 (diff)
drm/exynos: remove duplicated error routine and unnecessary assign
There were duplicated error handling routines during allocating pages in lowlevel_buffer_allocate() and g2d_userptr_get_dma_addr(). Also unnecessary NULL assignments for variable used not any more are removed from g2d_userptr_get_dma_addr() and g2d_userptr_put_dma_addr(). Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Signed-off-by: YoungJun Cho <yj44.cho@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_buf.c')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_buf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_buf.c b/drivers/gpu/drm/exynos/exynos_drm_buf.c
index 518b6d8e062b..b8ac06d92fbf 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_buf.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_buf.c
@@ -68,8 +68,8 @@ static int lowlevel_buffer_allocate(struct drm_device *dev,
68 &buf->dma_attrs); 68 &buf->dma_attrs);
69 if (!buf->kvaddr) { 69 if (!buf->kvaddr) {
70 DRM_ERROR("failed to allocate buffer.\n"); 70 DRM_ERROR("failed to allocate buffer.\n");
71 drm_free_large(buf->pages); 71 ret = -ENOMEM;
72 return -ENOMEM; 72 goto err_free;
73 } 73 }
74 74
75 start_addr = buf->dma_addr; 75 start_addr = buf->dma_addr;
@@ -106,7 +106,7 @@ err_free_attrs:
106 dma_free_attrs(dev->dev, buf->size, buf->pages, 106 dma_free_attrs(dev->dev, buf->size, buf->pages,
107 (dma_addr_t)buf->dma_addr, &buf->dma_attrs); 107 (dma_addr_t)buf->dma_addr, &buf->dma_attrs);
108 buf->dma_addr = (dma_addr_t)NULL; 108 buf->dma_addr = (dma_addr_t)NULL;
109 109err_free:
110 if (!is_drm_iommu_supported(dev)) 110 if (!is_drm_iommu_supported(dev))
111 drm_free_large(buf->pages); 111 drm_free_large(buf->pages);
112 112