Merge branch 'misc/mtd/sharpsl-nand' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / hci_usb.h

diff --git a/drivers/bluetooth/hci_usb.h b/drivers/bluetooth/hci_usb.h
index 1790cc8e431e255ac18c8d8984c99b02fbddde84..8e659914523f76990e1e736201044771531b02eb 100644 (file)
--- a/drivers/bluetooth/hci_usb.h
+++ b/drivers/bluetooth/hci_usb.h
@@ -70,8 +70,8 @@ static inline void _urb_queue_head(struct _urb_queue *q, struct _urb *_urb)
 {
        unsigned long flags;
        spin_lock_irqsave(&q->lock, flags);
-       /* _urb_unlink needs to know which spinlock to use, thus mb(). */
-       _urb->queue = q; mb(); list_add(&_urb->list, &q->head);
+       /* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */
+       _urb->queue = q; smp_mb(); list_add(&_urb->list, &q->head);
        spin_unlock_irqrestore(&q->lock, flags);
 }
 
@@ -79,8 +79,8 @@ static inline void _urb_queue_tail(struct _urb_queue *q, struct _urb *_urb)
 {
        unsigned long flags;
        spin_lock_irqsave(&q->lock, flags);
-       /* _urb_unlink needs to know which spinlock to use, thus mb(). */
-       _urb->queue = q; mb(); list_add_tail(&_urb->list, &q->head);
+       /* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */
+       _urb->queue = q; smp_mb(); list_add_tail(&_urb->list, &q->head);
        spin_unlock_irqrestore(&q->lock, flags);
 }
 
@@ -89,7 +89,7 @@ static inline void _urb_unlink(struct _urb *_urb)
        struct _urb_queue *q;
        unsigned long flags;
 
-       mb();
+       smp_mb();
        q = _urb->queue;
        /* If q is NULL, it will die at easy-to-debug NULL pointer dereference.
           No need to BUG(). */