1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 6aa8a86cb83b..036fb3bd5659 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -370,6 +370,10 @@ MODULE_PARM_DESC(debug, "Verbose logging (default = 0"
         ", busReset events = "  __stringify(OHCI_PARAM_DEBUG_BUSRESETS)
         ", or a combination, or all = -1)");
 
+static bool param_remote_dma;
+module_param_named(remote_dma, param_remote_dma, bool, 0444);
+MODULE_PARM_DESC(remote_dma, "Enable unfiltered remote DMA (default = N)");
+
 static void log_irqs(struct fw_ohci *ohci, u32 evt)
 {
         if (likely(!(param_debug &
@@ -2050,10 +2054,10 @@ static void bus_reset_work(struct work_struct *work)
                           be32_to_cpu(ohci->next_header));
         }
 
-#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA
-        reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
-        reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
-#endif
+        if (param_remote_dma) {
+                reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
+                reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
+        }
 
         spin_unlock_irq(&ohci->lock);
 
@@ -2587,13 +2591,13 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet)
 static int ohci_enable_phys_dma(struct fw_card *card,
                                 int node_id, int generation)
 {
-#ifdef CONFIG_FIREWIRE_OHCI_REMOTE_DMA
-        return 0;
-#else
         struct fw_ohci *ohci = fw_ohci(card);
         unsigned long flags;
         int n, ret = 0;
 
+        if (param_remote_dma)
+                return 0;
+
         /*
          * FIXME:  Make sure this bitmask is cleared when we clear the busReset
          * interrupt bit.  Clear physReqResourceAllBuses on bus reset.
@@ -2622,7 +2626,6 @@ static int ohci_enable_phys_dma(struct fw_card *card,
         spin_unlock_irqrestore(&ohci->lock, flags);
 
         return ret;
-#endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */
 }
 
 static u32 ohci_read_csr(struct fw_card *card, int csr_offset)