Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353999
b: refs/heads/master
c: cce17b4
h: refs/heads/master
i:
  353997: 9adfe7b
  353995: a9fbd0f
  353991: ec13f38
  353983: bda895f
v: v3
  • Loading branch information
Cong Ding authored and Greg Kroah-Hartman committed Jan 17, 2013
1 parent ba79dff commit 3e80cc4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4ee723a96f9313d67e88c7a9d3ae6162d2308f2d
refs/heads/master: cce17b457b3b346e5777ec770feb324663ea2b9b
6 changes: 3 additions & 3 deletions trunk/drivers/staging/omapdrm/omap_gem_dmabuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 3e80cc4

Please sign in to comment.