Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / sound / pci / bt87x.c

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 8546711d12f9275c9dba94bbfc1a59476e1c041a..70951fd9b354368e80fa59eeb9f80b70f773c635 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -443,7 +443,7 @@ static int snd_bt87x_pcm_open(struct snd_pcm_substream *substream)
 
 _error:
        clear_bit(0, &chip->opened);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
        return err;
 }
 
@@ -458,7 +458,7 @@ static int snd_bt87x_close(struct snd_pcm_substream *substream)
 
        chip->substream = NULL;
        clear_bit(0, &chip->opened);
-       smp_mb__after_clear_bit();
+       smp_mb__after_atomic();
        return 0;
 }