Commit e4deee04 authored by Marko Ristola's avatar Marko Ristola Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13711): [Mantis] FIX: Do nor toggle GPIF status 



Signed-off-by: default avatarMarko Ristola <marko.ristola@kolumbus.fi>
Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 01a8c3ee

drivers/media/dvb/mantis/mantis_dma.c

+4 −1
Original line number Diff line number Diff line
@@ -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);