diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-26 08:11:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-26 08:11:43 -0700 |
| commit | 8207649c41bf5c28a987be47d66545fa9d2994d8 (patch) | |
| tree | 959becddd4e666624cb95713b547e87011eb8ca6 /lib | |
| parent | f4cb707e7ad9727a046b463232f2de166e327d3e (diff) | |
| parent | dbab31aa2ceec2d201966fa0b552f151310ba5f4 (diff) | |
Merge branch 'akpm' (fixes from Andrew Morton)
Merge fixes from Andrew Morton:
"9 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: softdirty: keep bit when zapping file pte
fs/cachefiles: add missing \n to kerror conversions
genalloc: fix device node resource counter
drivers/rtc/rtc-efi.c: add missing module alias
mm, slab: initialize object alignment on cache creation
mm: softdirty: addresses before VMAs in PTE holes aren't softdirty
ocfs2/dlm: do not get resource spinlock if lockres is new
nilfs2: fix data loss with mmap()
ocfs2: free vol_label in ocfs2_delete_osb()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/genalloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/genalloc.c b/lib/genalloc.c index bdb9a456bcbb..38d2db82228c 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -588,6 +588,7 @@ struct gen_pool *of_get_named_gen_pool(struct device_node *np, if (!np_pool) return NULL; pdev = of_find_device_by_node(np_pool); + of_node_put(np_pool); if (!pdev) return NULL; return dev_get_gen_pool(&pdev->dev); |