These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / pci / mantis / mantis_pcmcia.c

diff --git a/kernel/drivers/media/pci/mantis/mantis_pcmcia.c b/kernel/drivers/media/pci/mantis/mantis_pcmcia.c
index 2f188c0..b2dbc7b 100644 (file)
--- a/kernel/drivers/media/pci/mantis/mantis_pcmcia.c
+++ b/kernel/drivers/media/pci/mantis/mantis_pcmcia.c
@@ -89,7 +89,7 @@ int mantis_pcmcia_init(struct mantis_ca *ca)
 
        u32 gpif_stat, card_stat;
 
-       mmwrite(mmread(MANTIS_INT_MASK) | MANTIS_INT_IRQ0, MANTIS_INT_MASK);
+       mantis_unmask_ints(mantis, MANTIS_INT_IRQ0);
        gpif_stat = mmread(MANTIS_GPIF_STATUS);
        card_stat = mmread(MANTIS_GPIF_IRQCFG);
 
@@ -117,5 +117,5 @@ void mantis_pcmcia_exit(struct mantis_ca *ca)
        struct mantis_pci *mantis = ca->ca_priv;
 
        mmwrite(mmread(MANTIS_GPIF_STATUS) & (~MANTIS_CARD_PLUGOUT | ~MANTIS_CARD_PLUGIN), MANTIS_GPIF_STATUS);
-       mmwrite(mmread(MANTIS_INT_MASK) & ~MANTIS_INT_IRQ0, MANTIS_INT_MASK);
+       mantis_mask_ints(mantis, MANTIS_INT_IRQ0);
 }