diff options
| author | Alan Tull <r80115@freescale.com> | 2010-05-25 16:44:26 -0500 |
|---|---|---|
| committer | Alan Tull <r80115@freescale.com> | 2010-05-27 15:23:42 -0500 |
| commit | 9d7d4eaf949824598a84e678b43479d0c4893076 (patch) | |
| tree | b0d0edfab97b536d5698209d53d1a3a65ca7c240 /arch/arm/plat-mxs | |
| parent | 2e0a5b93fbcc7659283e221cb5bf8216627979d1 (diff) | |
ENGR00123838 alsa: fall back to external ram if iram fails
If iram_alloc fails, should warn and fall back to external ram.
Signed-off-by: Alan Tull <r80115@freescale.com>
Diffstat (limited to 'arch/arm/plat-mxs')
| -rw-r--r-- | arch/arm/plat-mxs/iram.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-mxs/iram.c b/arch/arm/plat-mxs/iram.c index 3d2a391bd2d1..c63b0a2a9a10 100644 --- a/arch/arm/plat-mxs/iram.c +++ b/arch/arm/plat-mxs/iram.c @@ -36,6 +36,11 @@ void *iram_alloc(unsigned int size, unsigned long *dma_addr) *dma_addr = gen_pool_alloc(iram_pool, size); pr_debug("iram alloc - %dB@0x%p\n", size, (void *)*dma_addr); + + WARN_ON(!*dma_addr); + if (!*dma_addr) + return NULL; + return iram_phys_to_virt(*dma_addr); } EXPORT_SYMBOL(iram_alloc); |