diff options
| -rw-r--r-- | arch/mips/alchemy/common/dbdma.c | 7 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c index 5c68569344c1..f9201ca2295b 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) | |||
| 412 | if (desc_base == 0) | 412 | if (desc_base == 0) |
| 413 | return 0; | 413 | return 0; |
| 414 | 414 | ||
| 415 | ctp->cdb_membase = desc_base; | ||
| 415 | desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t)); | 416 | desc_base = ALIGN_ADDR(desc_base, sizeof(au1x_ddma_desc_t)); |
| 416 | } | 417 | } else |
| 418 | ctp->cdb_membase = desc_base; | ||
| 419 | |||
| 417 | dp = (au1x_ddma_desc_t *)desc_base; | 420 | dp = (au1x_ddma_desc_t *)desc_base; |
| 418 | 421 | ||
| 419 | /* Keep track of the base descriptor. */ | 422 | /* Keep track of the base descriptor. */ |
| @@ -831,7 +834,7 @@ void au1xxx_dbdma_chan_free(u32 chanid) | |||
| 831 | 834 | ||
| 832 | au1xxx_dbdma_stop(chanid); | 835 | au1xxx_dbdma_stop(chanid); |
| 833 | 836 | ||
| 834 | kfree((void *)ctp->chan_desc_base); | 837 | kfree((void *)ctp->cdb_membase); |
| 835 | 838 | ||
| 836 | stp->dev_flags &= ~DEV_FLAGS_INUSE; | 839 | stp->dev_flags &= ~DEV_FLAGS_INUSE; |
| 837 | dtp->dev_flags &= ~DEV_FLAGS_INUSE; | 840 | dtp->dev_flags &= ~DEV_FLAGS_INUSE; |
diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h index 06f68f43800a..d206000fbfe2 100644 --- a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h +++ b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | |||
| @@ -305,6 +305,7 @@ typedef struct dbdma_chan_config { | |||
| 305 | dbdev_tab_t *chan_dest; | 305 | dbdev_tab_t *chan_dest; |
| 306 | au1x_dma_chan_t *chan_ptr; | 306 | au1x_dma_chan_t *chan_ptr; |
| 307 | au1x_ddma_desc_t *chan_desc_base; | 307 | au1x_ddma_desc_t *chan_desc_base; |
| 308 | u32 cdb_membase; /* kmalloc base of above */ | ||
| 308 | au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr; | 309 | au1x_ddma_desc_t *get_ptr, *put_ptr, *cur_ptr; |
| 309 | void *chan_callparam; | 310 | void *chan_callparam; |
| 310 | void (*chan_callback)(int, void *); | 311 | void (*chan_callback)(int, void *); |
