diff --git a/[refs] b/[refs]
index 0c39030d461e..377ee1791f32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01a8c3eebb3c83df337f88332756f16154cecc0f
+refs/heads/master: e4deee04ffda9b44f367a40dbad8306ab88cb321
diff --git a/trunk/drivers/media/dvb/mantis/mantis_dma.c b/trunk/drivers/media/dvb/mantis/mantis_dma.c
index b8fd1c7cd294..e207870fb45d 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_dma.c
+++ b/trunk/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);