diff --git a/[refs] b/[refs]
index 1e2f0a8f9260..32ce2124ec48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c90d345fd7d66899d743611a47163f9904df90bc
+refs/heads/master: c02e15150c85619f22a98675124503ed93bf1914
diff --git a/trunk/drivers/media/dvb/mantis/mantis_evm.c b/trunk/drivers/media/dvb/mantis/mantis_evm.c
index 4c4c1448ddd4..008e2c28c06b 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_evm.c
+++ b/trunk/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/trunk/drivers/media/dvb/mantis/mantis_hif.c b/trunk/drivers/media/dvb/mantis/mantis_hif.c
index fa4bb6dc3241..6c51d1780015 100644
--- a/trunk/drivers/media/dvb/mantis/mantis_hif.c
+++ b/trunk/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;