diff options
| author |   Marcel Holtmann <marcel@holtmann.org> | 2014-07-04 17:23:34 +0200 |
|---|---|---|
| committer |   Johan Hedberg <johan.hedberg@intel.com> | 2014-07-04 21:09:59 +0300 |
| commit | af202f84415a69b964a9ec371e11781f2a1e5396 (patch) | |
| tree | 38fe03028c01eb9db551bf3228f16d994b329186 /net/bluetooth | |
| parent | Bluetooth: Add quirk for external configuration requirement (diff) | |
| download | linux-dev-af202f84415a69b964a9ec371e11781f2a1e5396.tar.xz linux-dev-af202f84415a69b964a9ec371e11781f2a1e5396.zip | |
Bluetooth: Fix quirks that are valid during setup driver callback
For the quirks that are allow to be set during setup callback, the
check needs to be modified so that they are applied even if no
setup callback provided by the driver.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_core.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index c007b3543e70..b29f3938e6b3 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2246,9 +2246,16 @@ static int hci_dev_do_open(struct hci_dev *hdev) atomic_set(&hdev->cmd_cnt, 1); set_bit(HCI_INIT, &hdev->flags); - if (hdev->setup && test_bit(HCI_SETUP, &hdev->dev_flags)) { - ret = hdev->setup(hdev); + if (test_bit(HCI_SETUP, &hdev->dev_flags)) { + if (hdev->setup) + ret = hdev->setup(hdev); + /* The transport driver can set these quirks before + * creating the HCI device or in its setup callback. + * + * In case any of them is set, the controller has to + * start up as unconfigured. + */ if (test_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks) || test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks)) set_bit(HCI_UNCONFIGURED, &hdev->dev_flags); |