diff options
author | Szymon Janc <szymon.janc@tieto.com> | 2012-05-23 06:35:46 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-06-04 23:34:06 -0400 |
commit | a6c511c636848f871f5b7aef38e25e5b894b3b48 (patch) | |
tree | 847b421858d21575ff61c02c83e92497d97b92d5 /net/bluetooth/hci_core.c | |
parent | 38351c66e407e610283e5332b819822055db473c (diff) |
Bluetooth: Rename HCI_QUIRK_NO_RESET to HCI_QUIRK_RESET_ON_CLOSE
HCI_QUIRK_NO_RESET name is misleading - purpose of this quirk is to
reset device on close instead of init, not to not reset at all.
Rename it to HCI_QUIRK_RESET_ON_CLOSE to avoid confusion.
Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r-- | net/bluetooth/hci_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index d0a960dabd5..0ed4edf0f77 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -203,7 +203,7 @@ static void bredr_init(struct hci_dev *hdev) | |||
203 | /* Mandatory initialization */ | 203 | /* Mandatory initialization */ |
204 | 204 | ||
205 | /* Reset */ | 205 | /* Reset */ |
206 | if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) { | 206 | if (!test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) { |
207 | set_bit(HCI_RESET, &hdev->flags); | 207 | set_bit(HCI_RESET, &hdev->flags); |
208 | hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL); | 208 | hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL); |
209 | } | 209 | } |
@@ -792,7 +792,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) | |||
792 | skb_queue_purge(&hdev->cmd_q); | 792 | skb_queue_purge(&hdev->cmd_q); |
793 | atomic_set(&hdev->cmd_cnt, 1); | 793 | atomic_set(&hdev->cmd_cnt, 1); |
794 | if (!test_bit(HCI_RAW, &hdev->flags) && | 794 | if (!test_bit(HCI_RAW, &hdev->flags) && |
795 | test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) { | 795 | test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) { |
796 | set_bit(HCI_INIT, &hdev->flags); | 796 | set_bit(HCI_INIT, &hdev->flags); |
797 | __hci_request(hdev, hci_reset_req, 0, | 797 | __hci_request(hdev, hci_reset_req, 0, |
798 | msecs_to_jiffies(250)); | 798 | msecs_to_jiffies(250)); |