diff options
| author | Dan Carpenter | 2015-01-16 11:43:42 +0100 |
|---|---|---|
| committer | Thierry Reding | 2015-01-27 10:14:41 +0100 |
| commit | 2cb207e413a9ace502edbce51c604e2088b0acb2 (patch) | |
| tree | f5dd70fc51950300a392d73fdb29fbb327ca4744 /drivers/gpu/drm/tegra/gem.c | |
| parent | drm/tegra: dc: Fix bad irqsave/restore in tegra_dc_finish_page_flip() (diff) | |
| download | kernel-qcow2-linux-2cb207e413a9ace502edbce51c604e2088b0acb2.tar.gz kernel-qcow2-linux-2cb207e413a9ace502edbce51c604e2088b0acb2.tar.xz kernel-qcow2-linux-2cb207e413a9ace502edbce51c604e2088b0acb2.zip | |
drm/tegra: gem: oops in error handling
kfree(ERR_PTR(-ENOMEM)) will not work very well.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/tegra/gem.c')
| -rw-r--r-- | drivers/gpu/drm/tegra/gem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 1ccde09d01c8..cfb481943b6b 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -214,10 +214,8 @@ static int tegra_bo_get_pages(struct drm_device *drm, struct tegra_bo *bo) for_each_sg(sgt->sgl, s, sgt->nents, i) sg_dma_address(s) = sg_phys(s); - if (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) == 0) { - sgt = ERR_PTR(-ENOMEM); + if (dma_map_sg(drm->dev, sgt->sgl, sgt->nents, DMA_TO_DEVICE) == 0) goto release_sgt; - } bo->sgt = sgt; @@ -226,6 +224,7 @@ static int tegra_bo_get_pages(struct drm_device *drm, struct tegra_bo *bo) release_sgt: sg_free_table(sgt); kfree(sgt); + sgt = ERR_PTR(-ENOMEM); put_pages: drm_gem_put_pages(&bo->gem, bo->pages, false, false); return PTR_ERR(sgt); |