diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-02 12:45:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-02 12:45:33 -0800 |
| commit | e770a0f1154193ca6b6e720a86aeaa2edc9261c6 (patch) | |
| tree | 04f5f5420e4116a18be8f94c117aadb870eaa46d /arch/mips/alchemy/common/dbdma.c | |
| parent | 7ab02af428c2d312c0cf8fb0b01cc1eb21131a3d (diff) | |
| parent | 91dfc423cc8cfd399fb308a837102a7ab7fa067e (diff) | |
| download | kernel_samsung_smdk4412-e770a0f1154193ca6b6e720a86aeaa2edc9261c6.zip kernel_samsung_smdk4412-e770a0f1154193ca6b6e720a86aeaa2edc9261c6.tar.gz kernel_samsung_smdk4412-e770a0f1154193ca6b6e720a86aeaa2edc9261c6.tar.bz2 | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: 64-bit: Detect virtual memory size
MIPS: AR7: Fix USB slave mem range typo
MIPS: Alchemy: Fix dbdma ring destruction memory debugcheck.
Diffstat (limited to 'arch/mips/alchemy/common/dbdma.c')
| -rw-r--r-- | arch/mips/alchemy/common/dbdma.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c index 5c68569..f9201ca 100644 --- a/arch/mips/alchemy/common/dbdma.c +++ b/arch/mips/alchemy/common/dbdma.c @@ -412,8 +412,11 @@ u32 au1xxx_dbdma_ring_alloc(u32 chanid, int entries) if (desc_base == 0) return 0; + ctp->cdb_membase = desc_base; desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t)); - } + } else + ctp->cdb_membase = desc_base; + dp = (au1x_ddma_desc_t *)desc_base; /* Keep track of the base descriptor. */ @@ -831,7 +834,7 @@ void au1xxx_dbdma_chan_free(u32 chanid) au1xxx_dbdma_stop(chanid); - kfree((void *)ctp->chan_desc_base); + kfree((void *)ctp->cdb_membase); stp->dev_flags &= ~DEV_FLAGS_INUSE; dtp->dev_flags &= ~DEV_FLAGS_INUSE; |