diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-08 18:44:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-08 18:46:13 +1100 |
| commit | 3439e34f56f4bf62ef0dfb11998dbba60683ad25 (patch) | |
| tree | d22405035ec2863e73e2afa5e1c62c2fc6cae06f /drivers/dma | |
| parent | e1e958029781a5f22a47807f9648ab9d221746f4 (diff) | |
| parent | 7c5598d4c8740214860372b6e6114f2675d68429 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/mm/init.c
fs/anon_inodes.c
fs/autofs4/inode.c
include/linux/lglock.h
kernel/Makefile
scripts/bloat-o-meter
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/mmp_tdma.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c index 2b4026d1f31d..3ddacc14a736 100644 --- a/drivers/dma/mmp_tdma.c +++ b/drivers/dma/mmp_tdma.c @@ -378,12 +378,7 @@ struct mmp_tdma_desc *mmp_tdma_alloc_descriptor(struct mmp_tdma_chan *tdmac) if (!gpool) return NULL; - tdmac->desc_arr = (void *)gen_pool_alloc(gpool, size); - if (!tdmac->desc_arr) - return NULL; - - tdmac->desc_arr_phys = gen_pool_virt_to_phys(gpool, - (unsigned long)tdmac->desc_arr); + tdmac->desc_arr = gen_pool_dma_alloc(gpool, size, &tdmac->desc_arr_phys); return tdmac->desc_arr; } |