V4L/DVB (13747): [Mantis] Bug Fix!: Use Register Address rather than register field
Signed-off-by: Sigmund Augdal <sigmund@snap.tv>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index 42e0360..9e058be 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -72,7 +72,7 @@
udelay(20);
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
if (mantis_hif_data_available(ca) != 0) {
dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer burst read failed", mantis->num);
return -EREMOTEIO;
@@ -81,7 +81,7 @@
dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer operation failed", mantis->num);
return -EREMOTEIO;
}
- data = mmread(MANTIS_GPIF_HIFDIN);
+ data = mmread(MANTIS_GPIF_DIN);
return (data >> 24) & 0xff;
}
@@ -100,8 +100,8 @@
mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
- mmwrite(data, MANTIS_GPIF_HIFDOUT);
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
+ mmwrite(data, MANTIS_GPIF_DOUT);
ca->hif_job_queue = MANTIS_HIF_MEMWR;
if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
@@ -124,7 +124,7 @@
hif_addr |= MANTIS_GPIF_PCMCIAIOM;
hif_addr |= addr;
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
ca->hif_job_queue = MANTIS_HIF_IOMRD;
if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
@@ -134,9 +134,9 @@
}
udelay(50);
ca->hif_job_queue &= ~MANTIS_HIF_IOMRD;
- data = mmread(MANTIS_GPIF_HIFDIN);
+ data = mmread(MANTIS_GPIF_DIN);
hif_addr |= MANTIS_GPIF_PCMCIAREG;
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
return data;
}
@@ -152,8 +152,8 @@
hif_addr |= MANTIS_GPIF_PCMCIAIOM;
hif_addr |= addr;
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
- mmwrite(data, MANTIS_GPIF_HIFDOUT);
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
+ mmwrite(data, MANTIS_GPIF_DOUT);
ca->hif_job_queue = MANTIS_HIF_IOMWR;
if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
@@ -164,7 +164,7 @@
udelay(50);
ca->hif_job_queue &= ~MANTIS_HIF_IOMWR;
hif_addr |= MANTIS_GPIF_PCMCIAREG;
- mmwrite(hif_addr, MANTIS_GPIF_HIFADDR);
+ mmwrite(hif_addr, MANTIS_GPIF_ADDR);
return 0;
}