aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 03:27:26 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 08:55:39 -0500
commit578413228ae72a09b29bf29e879e5b919ded0ac4 (patch)
tree8bbab191cc654c21501a198b328f642a8f1e66bf /drivers/media
parent17b77fc2d404910ca691661038ceb4c02d912d16 (diff)
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/media')
-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)
138 } 138 }
139 ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; 139 ca->hif_job_queue &= ~MANTIS_HIF_IOMRD;
140 data = mmread(MANTIS_GPIF_DIN); 140 data = mmread(MANTIS_GPIF_DIN);
141 hif_addr |= MANTIS_GPIF_PCMCIAREG;
142 mmwrite(hif_addr, MANTIS_GPIF_ADDR);
143 dprintk(verbose, MANTIS_DEBUG, 1, "I/O Read: 0x%02x", data); 141 dprintk(verbose, MANTIS_DEBUG, 1, "I/O Read: 0x%02x", data);
144 udelay(50); 142 udelay(50);
145 143
@@ -167,8 +165,6 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
167 return -EREMOTEIO; 165 return -EREMOTEIO;
168 } 166 }
169 ca->hif_job_queue &= ~MANTIS_HIF_IOMWR; 167 ca->hif_job_queue &= ~MANTIS_HIF_IOMWR;
170 hif_addr |= MANTIS_GPIF_PCMCIAREG;
171 mmwrite(hif_addr, MANTIS_GPIF_ADDR);
172 dprintk(verbose, MANTIS_DEBUG, 1, "I/O Write: (0x%02x to 0x%02x)", data, addr); 168 dprintk(verbose, MANTIS_DEBUG, 1, "I/O Write: (0x%02x to 0x%02x)", data, addr);
173 udelay(50); 169 udelay(50);
174 170