diff --git a/[refs] b/[refs]
index 09523f0ed147..4b56370ac699 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ee723a96f9313d67e88c7a9d3ae6162d2308f2d
+refs/heads/master: cce17b457b3b346e5777ec770feb324663ea2b9b
diff --git a/trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c b/trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c
index eabb8b57f6c3..27780b8bf155 100644
--- a/trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c
+++ b/trunk/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,