Merge 3.8-rc5 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / omapdrm / omap_gem_dmabuf.c

diff --git a/drivers/staging/omapdrm/omap_gem_dmabuf.c b/drivers/staging/omapdrm/omap_gem_dmabuf.c
index b6c5b5c6c8c53dbd39e84baa91cd43e1b81ebfb7..a3236abfca3d3b9a6450c3f15eca211945f5bfc1 100644 (file)
--- a/drivers/staging/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/staging/omapdrm/omap_gem_dmabuf.c
@@ -53,10 +53,10 @@ static struct sg_table *omap_gem_map_dma_buf(
        /* this should be after _get_paddr() to ensure we have pages attached */
        omap_gem_dma_sync(obj, dir);
 
-out:
-       if (ret)
-               return ERR_PTR(ret);
        return sg;
+out:
+       kfree(sg);
+       return ERR_PTR(ret);
 }
 
 static void omap_gem_unmap_dma_buf(struct dma_buf_attachment *attachment,