diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/af_bluetooth.c | 2 | ||||
-rw-r--r-- | net/bluetooth/hci_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 41f07f549ba7..f6f216e57aa3 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #define BT_DBG(D...) | 46 | #define BT_DBG(D...) |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #define VERSION "2.13" | 49 | #define VERSION "2.14" |
50 | 50 | ||
51 | /* Bluetooth sockets */ | 51 | /* Bluetooth sockets */ |
52 | #define BT_MAX_PROTO 8 | 52 | #define BT_MAX_PROTO 8 |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 7bb0f1cb7f26..fa7c5370b556 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -205,7 +205,7 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt) | |||
205 | /* Mandatory initialization */ | 205 | /* Mandatory initialization */ |
206 | 206 | ||
207 | /* Reset */ | 207 | /* Reset */ |
208 | if (test_bit(HCI_QUIRK_RESET_ON_INIT, &hdev->quirks)) | 208 | if (!test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) |
209 | hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL); | 209 | hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL); |
210 | 210 | ||
211 | /* Read Local Supported Features */ | 211 | /* Read Local Supported Features */ |