---

yaml --- r: 179510 b: refs/heads/master c: 5784132 h: refs/heads/master v: v3
git-mirror · Jan 17, 2010 · f6b9f30 · f6b9f30
1 parent e528a17
commit f6b9f30
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17b77fc2d404910ca691661038ceb4c02d912d16
+refs/heads/master: 578413228ae72a09b29bf29e879e5b919ded0ac4
diff --git a/trunk/drivers/media/dvb/mantis/mantis_hif.c b/trunk/drivers/media/dvb/mantis/mantis_hif.c
@@ -138,8 +138,6 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
 	}
 	ca->hif_job_queue &= ~MANTIS_HIF_IOMRD;
 	data = mmread(MANTIS_GPIF_DIN);
-	hif_addr |= MANTIS_GPIF_PCMCIAREG;
-	mmwrite(hif_addr, MANTIS_GPIF_ADDR);
 	dprintk(verbose, MANTIS_DEBUG, 1, "I/O Read: 0x%02x", data);
 	udelay(50);
 
@@ -167,8 +165,6 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
 		return -EREMOTEIO;
 	}
 	ca->hif_job_queue &= ~MANTIS_HIF_IOMWR;
-	hif_addr |= MANTIS_GPIF_PCMCIAREG;
-	mmwrite(hif_addr, MANTIS_GPIF_ADDR);
 	dprintk(verbose, MANTIS_DEBUG, 1, "I/O Write: (0x%02x to 0x%02x)", data, addr);
 	udelay(50);