summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 09:27:26 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 14:55:39 +0100
commit578413228ae72a09b29bf29e879e5b919ded0ac4 (patch)
tree8bbab191cc654c21501a198b328f642a8f1e66bf /drivers
parentV4L/DVB (13771): [Mantis] Reset Flags at the earliest possible (diff)
downloadlinux-578413228ae72a09b29bf29e879e5b919ded0ac4.tar.xz
linux-578413228ae72a09b29bf29e879e5b919ded0ac4.zip
V4L/DVB (13772): [Mantis] Do not enable Common Memory Access
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/mantis/mantis_hif.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index 2f1a6cb943db..151de2d687e2 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/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);