diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-14 19:58:44 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-18 14:07:57 -0500 |
commit | 3c54711c4fd103edf2044ab60726939f1de02b0c (patch) | |
tree | 3d223484adad4b641deff803182d97f9ece914b2 /net/bluetooth/hci_event.c | |
parent | bf4c63252490ba78fb833cc7acf1a5b1900c970f (diff) |
Bluetooth: Don't disable tasklets to call hdev->notify()
It's pointless, we aren't protecting anything since btusb_notify()
schedules a work to run, then all it operation happens without protection.
If protection is really needed here, we will fix it further.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0a9501f17366..93ecb2dfa177 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -378,11 +378,8 @@ static void hci_cc_read_voice_setting(struct hci_dev *hdev, struct sk_buff *skb) | |||
378 | 378 | ||
379 | BT_DBG("%s voice setting 0x%04x", hdev->name, setting); | 379 | BT_DBG("%s voice setting 0x%04x", hdev->name, setting); |
380 | 380 | ||
381 | if (hdev->notify) { | 381 | if (hdev->notify) |
382 | tasklet_disable(&hdev->tx_task); | ||
383 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); | 382 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); |
384 | tasklet_enable(&hdev->tx_task); | ||
385 | } | ||
386 | } | 383 | } |
387 | 384 | ||
388 | static void hci_cc_write_voice_setting(struct hci_dev *hdev, struct sk_buff *skb) | 385 | static void hci_cc_write_voice_setting(struct hci_dev *hdev, struct sk_buff *skb) |
@@ -409,11 +406,8 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev, struct sk_buff *skb | |||
409 | 406 | ||
410 | BT_DBG("%s voice setting 0x%04x", hdev->name, setting); | 407 | BT_DBG("%s voice setting 0x%04x", hdev->name, setting); |
411 | 408 | ||
412 | if (hdev->notify) { | 409 | if (hdev->notify) |
413 | tasklet_disable(&hdev->tx_task); | ||
414 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); | 410 | hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); |
415 | tasklet_enable(&hdev->tx_task); | ||
416 | } | ||
417 | } | 411 | } |
418 | 412 | ||
419 | static void hci_cc_host_buffer_size(struct hci_dev *hdev, struct sk_buff *skb) | 413 | static void hci_cc_host_buffer_size(struct hci_dev *hdev, struct sk_buff *skb) |