diff options
| author | YoungJun Cho <yj44.cho@samsung.com> | 2013-03-11 19:48:05 +0900 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2013-03-20 19:09:10 +0900 |
| commit | 067ed3311f7961bef67551fa5115dbadf9a035f4 (patch) | |
| tree | 6f174f9ccc484359db40c7c2806fd55b13e29278 /drivers/gpu | |
| parent | e2779e1698c7dbf36a02a9922d216b4db0e212b8 (diff) | |
| download | lwn-067ed3311f7961bef67551fa5115dbadf9a035f4.tar.gz lwn-067ed3311f7961bef67551fa5115dbadf9a035f4.zip | |
drm/exynos: Fix error routine to getting dma addr.
This patch fixes error routine when g2d_userptr_get_dma_add is failed.
When sg_alloc_table_from_pages() is failed, it doesn't call
sg_free_table() anymore.
Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_g2d.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 3b0da0378acf..28b71125189b 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c @@ -450,7 +450,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev, DMA_BIDIRECTIONAL); if (ret < 0) { DRM_ERROR("failed to map sgt with dma region.\n"); - goto err_free_sgt; + goto err_sg_free_table; } g2d_userptr->dma_addr = sgt->sgl[0].dma_address; @@ -467,8 +467,10 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev, return &g2d_userptr->dma_addr; -err_free_sgt: +err_sg_free_table: sg_free_table(sgt); + +err_free_sgt: kfree(sgt); sgt = NULL; |