diff options
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
-rw-r--r-- | arch/arm/plat-omap/dma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index e77373c39f8c..47ec77af4ccb 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -709,6 +709,7 @@ int omap_request_dma(int dev_id, const char *dev_name, | |||
709 | chan->dev_name = dev_name; | 709 | chan->dev_name = dev_name; |
710 | chan->callback = callback; | 710 | chan->callback = callback; |
711 | chan->data = data; | 711 | chan->data = data; |
712 | chan->flags = 0; | ||
712 | 713 | ||
713 | #ifndef CONFIG_ARCH_OMAP1 | 714 | #ifndef CONFIG_ARCH_OMAP1 |
714 | if (cpu_class_is_omap2()) { | 715 | if (cpu_class_is_omap2()) { |
@@ -1888,11 +1889,11 @@ static int omap2_dma_handle_ch(int ch) | |||
1888 | status = dma_read(CSR(ch)); | 1889 | status = dma_read(CSR(ch)); |
1889 | } | 1890 | } |
1890 | 1891 | ||
1892 | dma_write(status, CSR(ch)); | ||
1893 | |||
1891 | if (likely(dma_chan[ch].callback != NULL)) | 1894 | if (likely(dma_chan[ch].callback != NULL)) |
1892 | dma_chan[ch].callback(ch, status, dma_chan[ch].data); | 1895 | dma_chan[ch].callback(ch, status, dma_chan[ch].data); |
1893 | 1896 | ||
1894 | dma_write(status, CSR(ch)); | ||
1895 | |||
1896 | return 0; | 1897 | return 0; |
1897 | } | 1898 | } |
1898 | 1899 | ||