Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[sfrench/cifs-2.6.git] / net / bluetooth / hci_event.c

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 1096e4cd12833387313c7b5da3dd7698b3faad32..21e5913d12e03f4c8410a9464cd5794c9e5a0c70 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -45,7 +45,7 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)
                return;
 
        clear_bit(HCI_INQUIRY, &hdev->flags);
-       smp_mb__after_clear_bit(); /* wake_up_bit advises about this barrier */
+       smp_mb__after_atomic(); /* wake_up_bit advises about this barrier */
        wake_up_bit(&hdev->flags, HCI_INQUIRY);
 
        hci_conn_check_pending(hdev);
@@ -1880,7 +1880,7 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
        if (!test_and_clear_bit(HCI_INQUIRY, &hdev->flags))
                return;
 
-       smp_mb__after_clear_bit(); /* wake_up_bit advises about this barrier */
+       smp_mb__after_atomic(); /* wake_up_bit advises about this barrier */
        wake_up_bit(&hdev->flags, HCI_INQUIRY);
 
        if (!test_bit(HCI_MGMT, &hdev->dev_flags))