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;
 }