aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSigmund Augdal <sigmund@snap.tv>2009-12-04 05:28:24 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 11:55:39 -0200
commitc02e15150c85619f22a98675124503ed93bf1914 (patch)
tree9c023bc44618b1f609d8ef92476e48c528260b54
parentc90d345fd7d66899d743611a47163f9904df90bc (diff)
V4L/DVB (13774): [Mantis] Remove redundant wait for Burst Reads, wakeup the HIF event
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>
-rw-r--r--drivers/media/dvb/mantis/mantis_evm.c2
-rw-r--r--drivers/media/dvb/mantis/mantis_hif.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/dvb/mantis/mantis_evm.c
index 4c4c1448ddd..008e2c28c06 100644
--- a/drivers/media/dvb/mantis/mantis_evm.c
+++ b/drivers/media/dvb/mantis/mantis_evm.c
@@ -79,6 +79,8 @@ static void mantis_hifevm_work(struct work_struct *work)
if (gpif_stat & MANTIS_SBUF_OPDONE) {
dprintk(verbose, MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer operation complete", mantis->num);
ca->sbuf_status = MANTIS_SBUF_DATA_AVAIL;
+ ca->hif_event = MANTIS_SBUF_OPDONE;
+ wake_up(&ca->hif_opdone_wq);
}
}
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index fa4bb6dc324..6c51d178001 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -75,10 +75,6 @@ int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
udelay(20);
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;
- }
if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): GPIF Smart Buffer operation failed", mantis->num);
return -EREMOTEIO;