From 3e80cc476bcc5debcfe8bd59ca166e8768a50a51 Mon Sep 17 00:00:00 2001 From: Cong Ding Date: Tue, 15 Jan 2013 20:46:50 +0100 Subject: [PATCH] --- yaml --- r: 353999 b: refs/heads/master c: cce17b457b3b346e5777ec770feb324663ea2b9b h: refs/heads/master i: 353997: 9adfe7b4cc248c7783e993045d30d048fc46b591 353995: a9fbd0f8372b8c8d2a09acfcb9cfd05f69a0f71e 353991: ec13f388df8d7c8af322f2ae2abf87640e6de7e8 353983: bda895f7070e502311776ce8bbe803b7f28f6dc8 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 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,