51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
From 6c879c97e12ca27a73026c73069babe5fee648c5 Mon Sep 17 00:00:00 2001
|
|
From: Sigmund Augdal <sigmund@snap.tv>
|
|
Date: Fri, 4 Dec 2009 05:28:24 -0300
|
|
Subject: [PATCH 076/120] V4L/DVB (13774): [Mantis] Remove redundant wait for Burst Reads, wakeup the HIF event
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
(cherry picked from commit c02e15150c85619f22a98675124503ed93bf1914)
|
|
|
|
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
---
|
|
drivers/media/dvb/mantis/mantis_evm.c | 2 ++
|
|
drivers/media/dvb/mantis/mantis_hif.c | 4 ----
|
|
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 4c4c144..008e2c2 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 fa4bb6d..6c51d17 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;
|
|
--
|
|
1.7.1
|
|
|