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 /drivers/bluetooth/btusb.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 'drivers/bluetooth/btusb.c')
-rw-r--r-- | drivers/bluetooth/btusb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index c9463af8e564..3a6cdc9b75a3 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -1026,7 +1026,7 @@ static int btusb_probe(struct usb_interface *intf, | |||
1026 | data->isoc = usb_ifnum_to_if(data->udev, 1); | 1026 | data->isoc = usb_ifnum_to_if(data->udev, 1); |
1027 | 1027 | ||
1028 | if (!reset) | 1028 | if (!reset) |
1029 | set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks); | 1029 | set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks); |
1030 | 1030 | ||
1031 | if (force_scofix || id->driver_info & BTUSB_WRONG_SCO_MTU) { | 1031 | if (force_scofix || id->driver_info & BTUSB_WRONG_SCO_MTU) { |
1032 | if (!disable_scofix) | 1032 | if (!disable_scofix) |
@@ -1038,7 +1038,7 @@ static int btusb_probe(struct usb_interface *intf, | |||
1038 | 1038 | ||
1039 | if (id->driver_info & BTUSB_DIGIANSWER) { | 1039 | if (id->driver_info & BTUSB_DIGIANSWER) { |
1040 | data->cmdreq_type = USB_TYPE_VENDOR; | 1040 | data->cmdreq_type = USB_TYPE_VENDOR; |
1041 | set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks); | 1041 | set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks); |
1042 | } | 1042 | } |
1043 | 1043 | ||
1044 | if (id->driver_info & BTUSB_CSR) { | 1044 | if (id->driver_info & BTUSB_CSR) { |
@@ -1046,7 +1046,7 @@ static int btusb_probe(struct usb_interface *intf, | |||
1046 | 1046 | ||
1047 | /* Old firmware would otherwise execute USB reset */ | 1047 | /* Old firmware would otherwise execute USB reset */ |
1048 | if (le16_to_cpu(udev->descriptor.bcdDevice) < 0x117) | 1048 | if (le16_to_cpu(udev->descriptor.bcdDevice) < 0x117) |
1049 | set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks); | 1049 | set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks); |
1050 | } | 1050 | } |
1051 | 1051 | ||
1052 | if (id->driver_info & BTUSB_SNIFFER) { | 1052 | if (id->driver_info & BTUSB_SNIFFER) { |