diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-20 17:04:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-20 17:26:35 +1100 |
| commit | 3baf68f92a57e6f09cff20194dbdfa2bdc4ea690 (patch) | |
| tree | e457ad4ecd61664fcbc5faf3bb76169ff868292f /mm/dmapool.c | |
| parent | 9cfef73307b0568cfbaff137ccb2a1febb174d05 (diff) | |
| parent | b38448e0fa6ae60a8444af9327f47ad6136d5429 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'mm/dmapool.c')
| -rw-r--r-- | mm/dmapool.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/dmapool.c b/mm/dmapool.c index c69781e97cf9..668f26316e2e 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -132,6 +132,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, { struct dma_pool *retval; size_t allocation; + int node; if (align == 0) { align = 1; @@ -156,7 +157,9 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, return NULL; } - retval = kmalloc_node(sizeof(*retval), GFP_KERNEL, dev_to_node(dev)); + node = WARN_ON(!dev) ? -1 : dev_to_node(dev); + + retval = kmalloc_node(sizeof(*retval), GFP_KERNEL, node); if (!retval) return retval; |