diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 21:26:01 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 21:26:01 +0200 |
| commit | 220b881a77eca96afdd6037dbca3441e8938228f (patch) | |
| tree | 51d1a273521238b5127409c9ea2c0b2df02ec6e9 /net/bluetooth/mgmt.c | |
| parent | Bluetooth: Add local Extended Inquiry Response (EIR) support (diff) | |
| parent | Bluetooth: Fix warning with hci_cmd_timer (diff) | |
| download | linux-220b881a77eca96afdd6037dbca3441e8938228f.tar.xz linux-220b881a77eca96afdd6037dbca3441e8938228f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 62055c9a8084..f87691e04dca 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1389,6 +1389,8 @@ static int user_confirm_reply(struct sock *sk, u16 index, unsigned char *data, if (!hdev) return cmd_status(sk, index, mgmt_op, ENODEV); + hci_dev_lock_bh(hdev); + if (!test_bit(HCI_UP, &hdev->flags)) { err = cmd_status(sk, index, mgmt_op, ENETDOWN); goto failed; |