aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 03:08:25 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 08:55:34 -0500
commit3062b1571a1d3520c4d3160ebbfca8002b1d6963 (patch)
tree55a59532a64f235aea3265b87d68dcf7eaf58eee
parentd9dd5f7168d6a61491996fc02e4deb9d96308178 (diff)
V4L/DVB (13739): [Mantis] Event Manager: Handle Masked events only
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_dvb.c1
-rw-r--r--drivers/media/dvb/mantis/mantis_evm.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
index 3325b59ce19c..ade444963c84 100644
--- a/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/drivers/media/dvb/mantis/mantis_dvb.c
@@ -313,6 +313,7 @@ int __devinit mantis_frontend_init(struct mantis_pci *mantis)
313 313
314int __devexit mantis_dvb_exit(struct mantis_pci *mantis) 314int __devexit mantis_dvb_exit(struct mantis_pci *mantis)
315{ 315{
316 mantis_ca_exit(mantis);
316 tasklet_kill(&mantis->tasklet); 317 tasklet_kill(&mantis->tasklet);
317 dvb_net_release(&mantis->dvbnet); 318 dvb_net_release(&mantis->dvbnet);
318 mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem); 319 mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem);
diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/dvb/mantis/mantis_evm.c
index d81068d08345..c35ddd868f89 100644
--- a/drivers/media/dvb/mantis/mantis_evm.c
+++ b/drivers/media/dvb/mantis/mantis_evm.c
@@ -27,9 +27,12 @@ void mantis_hifevm_tasklet(unsigned long data)
27 struct mantis_ca *ca = (struct mantis_ca *) data; 27 struct mantis_ca *ca = (struct mantis_ca *) data;
28 struct mantis_pci *mantis = ca->ca_priv; 28 struct mantis_pci *mantis = ca->ca_priv;
29 29
30 u32 gpif_stat; 30 u32 gpif_stat, gpif_mask;
31 31
32 gpif_stat = mmread(MANTIS_GPIF_STATUS); 32 gpif_stat = mmread(MANTIS_GPIF_STATUS);
33 gpif_mask = mmread(MANTIS_GPIF_IRQCFG);
34 if (!((gpif_stat & 0xff) & (gpif_mask & 0xff)))
35 return;
33 36
34 if (gpif_stat & MANTIS_GPIF_DETSTAT) { 37 if (gpif_stat & MANTIS_GPIF_DETSTAT) {
35 if (gpif_stat & MANTIS_CARD_PLUGIN) { 38 if (gpif_stat & MANTIS_CARD_PLUGIN) {