projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
17b77fc
)
V4L/DVB (13772): [Mantis] Do not enable Common Memory Access
author
Manu Abraham
<abraham.manu@gmail.com>
Fri, 4 Dec 2009 08:27:26 +0000
(
05:27
-0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Sun, 17 Jan 2010 13:55:39 +0000
(11:55 -0200)
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/mantis/mantis_hif.c
patch
|
blob
|
history
diff --git
a/drivers/media/dvb/mantis/mantis_hif.c
b/drivers/media/dvb/mantis/mantis_hif.c
index
2f1a6cb
..
151de2d
100644
(file)
--- 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);