Merge tag 'firewire-fix-vt6315' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / drivers / firewire / ohci.c

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 41df806e9e8064dc707b8b010842bf567efefb83..a66a3217f1d92f939fa4f6f2b1ee7a7ee976488f 100644 (file)
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -3505,7 +3505,7 @@ static int ohci_flush_iso_completions(struct fw_iso_context *base)
                }
 
                clear_bit_unlock(0, &ctx->flushing_completions);
-               smp_mb__after_clear_bit();
+               smp_mb__after_atomic();
        }
 
        tasklet_enable(&ctx->context.tasklet);
@@ -3723,7 +3723,7 @@ static int pci_probe(struct pci_dev *dev,
                    version >> 16, version & 0xff, ohci->card.index,
                    ohci->n_ir, ohci->n_it, ohci->quirks,
                    reg_read(ohci, OHCI1394_PhyUpperBound) ?
-                       ", >4 GB phys DMA" : "");
+                       ", physUB" : "");
 
        return 0;