diff options
| author | Marko Ristola <marko.ristola@kolumbus.fi> | 2009-12-03 05:39:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-17 11:55:29 -0200 |
| commit | e4deee04ffda9b44f367a40dbad8306ab88cb321 (patch) | |
| tree | 032387b8e8fd66d14788aefe834f91c67b8de02d /drivers/media/dvb/mantis/mantis_dma.c | |
| parent | 01a8c3eebb3c83df337f88332756f16154cecc0f (diff) | |
| download | linux-stable-e4deee04ffda9b44f367a40dbad8306ab88cb321.tar.gz linux-stable-e4deee04ffda9b44f367a40dbad8306ab88cb321.tar.bz2 linux-stable-e4deee04ffda9b44f367a40dbad8306ab88cb321.zip | |
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/mantis_dma.c')
| -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) mantis_risc_program(mantis); mmwrite(cpu_to_le32(mantis->risc_dma), MANTIS_RISC_START); - mmwrite(MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR); +// mmwrite(MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR); + mmwrite(mmread(MANTIS_GPIF_ADDR) | MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR); mmwrite(0, MANTIS_DMA_CTL); mantis->last_block = mantis->finished_block = 0; @@ -210,6 +211,8 @@ void mantis_dma_stop(struct mantis_pci *mantis) mask = mmread(MANTIS_INT_MASK); dprintk(verbose, MANTIS_DEBUG, 1, "Mantis Stop DMA engine"); + mmwrite((mmread(MANTIS_GPIF_ADDR) & (~(MANTIS_GPIF_RDWRN))), MANTIS_GPIF_ADDR); + mmwrite((mmread(MANTIS_DMA_CTL) & ~(MANTIS_FIFO_EN | MANTIS_DCAP_EN | MANTIS_RISC_EN)), MANTIS_DMA_CTL); |