diff --git a/[refs] b/[refs] index 2de22c9e0edb..1a6b9f7e9afd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ddc404bc0b3750b015b021653a88943591f40f6 +refs/heads/master: 1119707e225c1627ed3f413a569e297883946fb2 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c index b98da307faec..d9307bd29738 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c @@ -40,21 +40,15 @@ static struct sg_table *exynos_get_sgt(struct drm_device *drm_dev, if (!sgt) goto out; - ret = sg_alloc_table(sgt, buf->sgt->nents, GFP_KERNEL); - if (ret) - goto err_free_sgt; - ret = dma_get_sgtable(drm_dev->dev, sgt, buf->kvaddr, buf->dma_addr, buf->size); if (ret < 0) { DRM_ERROR("failed to get sgtable.\n"); - goto err_free_table; + goto err_free_sgt; } return sgt; -err_free_table: - sg_free_table(sgt); err_free_sgt: kfree(sgt); sgt = NULL;