[PATCH 23/50] BT: bfusb: read_lock in complete() cleanup
From: Ming Lei <hidden>
Date: 2013-07-11 09:09:43
Also in:
alsa-devel, linux-media, linux-wireless, netdev
Subsystem:
bluetooth drivers, the rest · Maintainers:
Marcel Holtmann, Luiz Augusto von Dentz, Linus Torvalds
Complete() will be run with interrupt enabled, so change to read_lock_irqsave(). Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Gustavo Padovan <redacted> Cc: Johan Hedberg <redacted> Cc: linux-bluetooth@vger.kernel.org Signed-off-by: Ming Lei <redacted> --- drivers/bluetooth/bfusb.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index 995aee9..2e93501 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c@@ -186,6 +186,7 @@ static void bfusb_tx_complete(struct urb *urb) { struct sk_buff *skb = (struct sk_buff *) urb->context; struct bfusb_data *data = (struct bfusb_data *) skb->dev; + unsigned long flags; BT_DBG("bfusb %p urb %p skb %p len %d", data, urb, skb, skb->len);
@@ -199,14 +200,14 @@ static void bfusb_tx_complete(struct urb *urb) else data->hdev->stat.err_tx++; - read_lock(&data->lock); + read_lock_irqsave(&data->lock, flags); skb_unlink(skb, &data->pending_q); skb_queue_tail(&data->completed_q, skb); bfusb_tx_wakeup(data); - read_unlock(&data->lock); + read_unlock_irqrestore(&data->lock, flags); }
@@ -347,10 +348,11 @@ static void bfusb_rx_complete(struct urb *urb) unsigned char *buf = urb->transfer_buffer; int count = urb->actual_length; int err, hdr, len; + unsigned long flags; BT_DBG("bfusb %p urb %p skb %p len %d", data, urb, skb, skb->len); - read_lock(&data->lock); + read_lock_irqsave(&data->lock, flags); if (!test_bit(HCI_RUNNING, &data->hdev->flags)) goto unlock;
@@ -392,7 +394,7 @@ static void bfusb_rx_complete(struct urb *urb) bfusb_rx_submit(data, urb); - read_unlock(&data->lock); + read_unlock_irqrestore(&data->lock, flags); return;
@@ -406,7 +408,7 @@ resubmit: } unlock: - read_unlock(&data->lock); + read_unlock_irqrestore(&data->lock, flags); } static int bfusb_open(struct hci_dev *hdev)
--
1.7.9.5