diff options
author | Marko Ristola <marko.ristola@kolumbus.fi> | 2009-12-03 03:39:22 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-17 08:55:29 -0500 |
commit | e4deee04ffda9b44f367a40dbad8306ab88cb321 (patch) | |
tree | 032387b8e8fd66d14788aefe834f91c67b8de02d /drivers/media/dvb/mantis | |
parent | 01a8c3eebb3c83df337f88332756f16154cecc0f (diff) |
V4L/DVB (13711): [Mantis] FIX: Do nor toggle GPIF status
Signed-off-by: Marko Ristola <marko.ristola@kolumbus.fi>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/mantis')
-rw-r--r-- | drivers/media/dvb/mantis/mantis_dma.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c index b8fd1c7cd294..e207870fb45d 100644 --- a/drivers/media/dvb/mantis/mantis_dma.c +++ b/drivers/media/dvb/mantis/mantis_dma.c | |||
@@ -190,7 +190,8 @@ void mantis_dma_start(struct mantis_pci *mantis) | |||
190 | 190 | ||
191 | mantis_risc_program(mantis); | 191 | mantis_risc_program(mantis); |
192 | mmwrite(cpu_to_le32(mantis->risc_dma), MANTIS_RISC_START); | 192 | mmwrite(cpu_to_le32(mantis->risc_dma), MANTIS_RISC_START); |
193 | mmwrite(MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR); | 193 | // mmwrite(MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR); |
194 | mmwrite(mmread(MANTIS_GPIF_ADDR) | MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR); | ||
194 | 195 | ||
195 | mmwrite(0, MANTIS_DMA_CTL); | 196 | mmwrite(0, MANTIS_DMA_CTL); |
196 | mantis->last_block = mantis->finished_block = 0; | 197 | mantis->last_block = mantis->finished_block = 0; |
@@ -210,6 +211,8 @@ void mantis_dma_stop(struct mantis_pci *mantis) | |||
210 | mask = mmread(MANTIS_INT_MASK); | 211 | mask = mmread(MANTIS_INT_MASK); |
211 | dprintk(verbose, MANTIS_DEBUG, 1, "Mantis Stop DMA engine"); | 212 | dprintk(verbose, MANTIS_DEBUG, 1, "Mantis Stop DMA engine"); |
212 | 213 | ||
214 | mmwrite((mmread(MANTIS_GPIF_ADDR) & (~(MANTIS_GPIF_RDWRN))), MANTIS_GPIF_ADDR); | ||
215 | |||
213 | mmwrite((mmread(MANTIS_DMA_CTL) & ~(MANTIS_FIFO_EN | | 216 | mmwrite((mmread(MANTIS_DMA_CTL) & ~(MANTIS_FIFO_EN | |
214 | MANTIS_DCAP_EN | | 217 | MANTIS_DCAP_EN | |
215 | MANTIS_RISC_EN)), MANTIS_DMA_CTL); | 218 | MANTIS_RISC_EN)), MANTIS_DMA_CTL); |