---

yaml --- r: 127111 b: refs/heads/master c: d41e800 h: refs/heads/master i: 127109: ec6be5c 127107: 3c888ba 127103: 121e15f v: v3
git-mirror · Jan 7, 2009 · 9b936c0 · 9b936c0
1 parent 7cc0428
commit 9b936c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;
 }