Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / drivers / firewire / ohci.c

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index aff9018d06588d7b37cf6f836cb62d12d0597bf0..fc87dede093d3c104b01f49a44ce703c7abbb4f8 100644 (file)
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2054,10 +2054,12 @@ static void bus_reset_work(struct work_struct *work)
                          be32_to_cpu(ohci->next_header));
        }
 
+#ifndef CONFIG_GRKERNSEC
        if (param_remote_dma) {
                reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
                reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
        }
+#endif
 
        spin_unlock_irq(&ohci->lock);
 
@@ -2589,8 +2591,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
        unsigned long flags;
        int n, ret = 0;
 
+#ifndef CONFIG_GRKERNSEC
        if (param_remote_dma)
                return 0;
+#endif
 
        /*
         * FIXME:  Make sure this bitmask is cleared when we clear the busReset