---

yaml --- r: 92333 b: refs/heads/master c: 565c0d3 h: refs/heads/master i: 92331: 2ca2a24 v: v3
git-mirror · Apr 24, 2008 · ae5a80b · ae5a80b
1 parent 743c71b
commit ae5a80b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5be36d22b28f01e5074f78b29aa6128da0a53641
+refs/heads/master: 565c0d3ff438d18aa8c3201979fb1f5d1872ab11
diff --git a/trunk/arch/blackfin/kernel/bfin_dma_5xx.c b/trunk/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -106,12 +106,15 @@ int request_dma(unsigned int channel, char *device_id)
 
 #ifdef CONFIG_BF54x
 	if (channel >= CH_UART2_RX && channel <= CH_UART3_TX) {
-		if (strncmp(device_id, "BFIN_UART", 9) == 0)
+		if (strncmp(device_id, "BFIN_UART", 9) == 0) {
+			dma_ch[channel].regs->peripheral_map &= 0x0FFF;
 			dma_ch[channel].regs->peripheral_map |=
 				((channel - CH_UART2_RX + 0xC)<<12);
-		else
+		} else {
+			dma_ch[channel].regs->peripheral_map &= 0x0FFF;
 			dma_ch[channel].regs->peripheral_map |=
 				((channel - CH_UART2_RX + 0x6)<<12);
+		}
 	}
 #endif