---

yaml --- r: 179506 b: refs/heads/master c: adcc9dd h: refs/heads/master v: v3
git-mirror · Jan 17, 2010 · a337e4e · a337e4e
1 parent c017de7
commit a337e4e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18b6de42d77e7762be929a4a858c359de352e1e2
+refs/heads/master: adcc9dd57e814d5ac3928f92f431fbe4808e936f
diff --git a/trunk/drivers/media/dvb/mantis/mantis_evm.c b/trunk/drivers/media/dvb/mantis/mantis_evm.c
@@ -27,11 +27,19 @@ static void mantis_hifevm_work(struct work_struct *work)
 	struct mantis_ca *ca = container_of(work, struct mantis_ca, hif_evm_work);
 	struct mantis_pci *mantis = ca->ca_priv;
 
-	u32 gpif_stat, gpif_mask;
+	u32 gpif_stat, gpif_mask, rst_mask, rst_stat;
+
+	rst_mask  = MANTIS_GPIF_WRACK  |
+		    MANTIS_GPIF_OTHERR |
+		    MANTIS_SBUF_WSTO   |
+		    MANTIS_GPIF_EXTIRQ;
 
 	gpif_stat = mmread(MANTIS_GPIF_STATUS);
 	gpif_mask = mmread(MANTIS_GPIF_IRQCFG);
 
+	rst_stat = gpif_stat & rst_mask;
+	mmwrite(rst_stat, MANTIS_GPIF_STATUS);
+
 	if (gpif_stat & MANTIS_GPIF_DETSTAT) {
 		if (gpif_stat & MANTIS_CARD_PLUGIN) {
 			dprintk(verbose, MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): CAM Plugin", mantis->num);

diff --git a/trunk/drivers/media/dvb/mantis/mantis_hif.c b/trunk/drivers/media/dvb/mantis/mantis_hif.c
@@ -188,6 +188,7 @@ int mantis_hif_init(struct mantis_ca *ca)
 
 	irqcfg  = mmread(MANTIS_GPIF_IRQCFG);
 	irqcfg |= MANTIS_MASK_BRRDY;
+	irqcfg |= MANTIS_MASK_WRACK;
 	mmwrite(irqcfg, MANTIS_GPIF_IRQCFG);
 
 	return 0;