Skip to content

Commit

Permalink
V4L/DVB (13711): [Mantis] FIX: Do nor toggle GPIF status
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marko Ristola authored and Mauro Carvalho Chehab committed Jan 17, 2010
1 parent 01a8c3e commit e4deee0
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/media/dvb/mantis/mantis_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit e4deee0

Please sign in to comment.