Commit 3062b157 authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13739): [Mantis] Event Manager: Handle Masked events only 



Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d9dd5f71

drivers/media/dvb/mantis/mantis_dvb.c

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ int __devinit mantis_frontend_init(struct mantis_pci *mantis) 


int __devexit mantis_dvb_exit(struct mantis_pci *mantis)

{

	mantis_ca_exit(mantis);

	tasklet_kill(&mantis->tasklet);

	dvb_net_release(&mantis->dvbnet);

	mantis->demux.dmx.remove_frontend(&mantis->demux.dmx, &mantis->fe_mem);

drivers/media/dvb/mantis/mantis_evm.c

+4 −1
Original line number Diff line number Diff line
@@ -27,9 +27,12 @@ void mantis_hifevm_tasklet(unsigned long data) 
	struct mantis_ca *ca = (struct mantis_ca *) data;

	struct mantis_pci *mantis = ca->ca_priv;



	u32 gpif_stat;

	u32 gpif_stat, gpif_mask;



	gpif_stat = mmread(MANTIS_GPIF_STATUS);

	gpif_mask = mmread(MANTIS_GPIF_IRQCFG);

	if (!((gpif_stat & 0xff) & (gpif_mask & 0xff)))

		return;



	if (gpif_stat & MANTIS_GPIF_DETSTAT) {

		if (gpif_stat & MANTIS_CARD_PLUGIN) {