From 00b60bc046bea669b5ded829ed2c0effd64e11ea Mon Sep 17 00:00:00 2001 From: Cong Ding Date: Tue, 15 Jan 2013 20:46:50 +0100 Subject: [PATCH] --- yaml --- r: 358186 b: refs/heads/master c: 32ac1a5286d56b3c822f4a1a8d0f7fc5d586de38 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 70b6bd165d24..c9ccc219f398 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 238083ad5d67d1c9ba6e7158a027e834a48bb23b +refs/heads/master: 32ac1a5286d56b3c822f4a1a8d0f7fc5d586de38 diff --git a/trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c b/trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c index b6c5b5c6c8c5..a3236abfca3d 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,