git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
iovmm.c
diff --git
a/arch/arm/plat-omap/iovmm.c
b/arch/arm/plat-omap/iovmm.c
index
e43983b
..
8ce0de2
100644
(file)
--- a/
arch/arm/plat-omap/iovmm.c
+++ b/
arch/arm/plat-omap/iovmm.c
@@
-140,8
+140,10
@@
static struct sg_table *sgtable_alloc(const size_t bytes, u32 flags)
return ERR_PTR(-ENOMEM);
err = sg_alloc_table(sgt, nr_entries, GFP_KERNEL);
- if (err)
+ if (err) {
+ kfree(sgt);
return ERR_PTR(err);
+ }
pr_debug("%s: sgt:%p(%d entries)\n", __func__, sgt, nr_entries);