From 9b936c09f232cd5845858ebee76debda67ab2a0a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 7 Jan 2009 23:14:38 +0800 Subject: [PATCH] --- yaml --- r: 127111 b: refs/heads/master c: d41e8009994f429ef7198a750c37fd9660366fab h: refs/heads/master i: 127109: ec6be5cb66e028de543fab0c22dc4c09f24bd148 127107: 3c888bad39b059c263fb1d1737f016979ce44ff4 127103: 121e15f5c92e6e7f6fd8a1b59f73ce351b89005a v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/dma.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4c48e4500266..fcf3325f0e69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6498391923c0a189c7719bc559f713f1e872238 +refs/heads/master: d41e8009994f429ef7198a750c37fd9660366fab diff --git a/trunk/arch/blackfin/include/asm/dma.h b/trunk/arch/blackfin/include/asm/dma.h index 264feb4eb175..f58ca64d729c 100644 --- a/trunk/arch/blackfin/include/asm/dma.h +++ b/trunk/arch/blackfin/include/asm/dma.h @@ -205,7 +205,9 @@ static inline unsigned long get_dma_curr_addr(unsigned int channel) static inline void set_dma_sg(unsigned int channel, struct dmasg *sg, int ndsize) { - dma_ch[channel].regs->cfg |= ((ndsize & 0x0F) << 8); + dma_ch[channel].regs->cfg = + (dma_ch[channel].regs->cfg & ~(0xf << 8)) | + ((ndsize & 0xf) << 8); dma_ch[channel].regs->next_desc_ptr = sg; }