diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2008-02-25 11:13:07 +0800 |
|---|---|---|
| committer | Bryan Wu <cooloney@kernel.org> | 2008-02-25 11:13:07 +0800 |
| commit | 549aaa8425b4a1de23cbddc650dac75b91204af6 (patch) | |
| tree | f0f409b09263c0bd4220ae284759fffc4f3668a6 /arch | |
| parent | cad2ab65dd1c7d65153ffccd71c90db028fd62f0 (diff) | |
| download | kernel-crypto-549aaa8425b4a1de23cbddc650dac75b91204af6.tar.gz kernel-crypto-549aaa8425b4a1de23cbddc650dac75b91204af6.tar.xz kernel-crypto-549aaa8425b4a1de23cbddc650dac75b91204af6.zip | |
[Blackfin] arch: Fix bug - Setting peripheral_map only when dma channel is UART2/3.
Singed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/kernel/bfin_dma_5xx.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c index 5453bc3664f..8fd5d22cec3 100644 --- a/arch/blackfin/kernel/bfin_dma_5xx.c +++ b/arch/blackfin/kernel/bfin_dma_5xx.c @@ -105,13 +105,14 @@ int request_dma(unsigned int channel, char *device_id) mutex_unlock(&(dma_ch[channel].dmalock)); #ifdef CONFIG_BF54x - if (channel >= CH_UART2_RX && channel <= CH_UART3_TX && - strncmp(device_id, "BFIN_UART", 9) == 0) - dma_ch[channel].regs->peripheral_map |= - (channel - CH_UART2_RX + 0xC); - else - dma_ch[channel].regs->peripheral_map |= - (channel - CH_UART2_RX + 0x6); + if (channel >= CH_UART2_RX && channel <= CH_UART3_TX) { + if (strncmp(device_id, "BFIN_UART", 9) == 0) + dma_ch[channel].regs->peripheral_map |= + (channel - CH_UART2_RX + 0xC); + else + dma_ch[channel].regs->peripheral_map |= + (channel - CH_UART2_RX + 0x6); + } #endif dma_ch[channel].device_id = device_id; |