diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 14:41:19 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-11 14:41:19 -0400 |
| commit | 4af6600fd793023c01634cca5abfe4a2b707788f (patch) | |
| tree | 9e3a830d7782512b492011932ddd789d13a900c4 /lib/genalloc.c | |
| parent | 447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (diff) | |
| parent | 68da166491655bc54051bf04c78ce648e2e33508 (diff) | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 3.18.
Diffstat (limited to 'lib/genalloc.c')
| -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, | |||
| 588 | if (!np_pool) | 588 | if (!np_pool) |
| 589 | return NULL; | 589 | return NULL; |
| 590 | pdev = of_find_device_by_node(np_pool); | 590 | pdev = of_find_device_by_node(np_pool); |
| 591 | of_node_put(np_pool); | ||
| 591 | if (!pdev) | 592 | if (!pdev) |
| 592 | return NULL; | 593 | return NULL; |
| 593 | return dev_get_gen_pool(&pdev->dev); | 594 | return dev_get_gen_pool(&pdev->dev); |