aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2009-01-07 23:14:38 +0800
committerBryan Wu <cooloney@kernel.org>2009-01-07 23:14:38 +0800
commitd41e8009994f429ef7198a750c37fd9660366fab (patch)
tree34a8cd4e044bc9b60f275838e3a98bb2f9946b3a
parentb6498391923c0a189c7719bc559f713f1e872238 (diff)
downloadkernel_goldelico_gta04-d41e8009994f429ef7198a750c37fd9660366fab.zip
kernel_goldelico_gta04-d41e8009994f429ef7198a750c37fd9660366fab.tar.gz
kernel_goldelico_gta04-d41e8009994f429ef7198a750c37fd9660366fab.tar.bz2
Blackfin arch: dma code: cannot simply OR the ndsize
cannot simply OR the ndsize ... need to clear out the old value first Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
-rw-r--r--arch/blackfin/include/asm/dma.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h
index 264feb4..f58ca64 100644
--- a/arch/blackfin/include/asm/dma.h
+++ b/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;
}