diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-06 14:59:32 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-06 14:59:32 -0500 |
| commit | facda29d75a30a8ff4f1f23a48a368d167563843 (patch) | |
| tree | 3f0b8e77cb826cd24e9f0b760b27467eda76907a /net/bluetooth/hci_event.c | |
| parent | 9995ffe5f5fdddcc73e4465cc3f8b38714df8108 (diff) | |
| parent | 33cb722c22f28964a501a56cc76397834c221c7a (diff) | |
| download | linux-facda29d75a30a8ff4f1f23a48a368d167563843.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index d7d96b6b1f0d..643a41b76e2e 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -545,7 +545,7 @@ static void hci_setup(struct hci_dev *hdev) { hci_setup_event_mask(hdev); - if (hdev->lmp_ver > 1) + if (hdev->hci_ver > 1) hci_send_cmd(hdev, HCI_OP_READ_LOCAL_COMMANDS, 0, NULL); if (hdev->features[6] & LMP_SIMPLE_PAIR) { |