diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 15:26:01 -0400 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 15:26:01 -0400 |
| commit | 220b881a77eca96afdd6037dbca3441e8938228f (patch) | |
| tree | 51d1a273521238b5127409c9ea2c0b2df02ec6e9 /net/bluetooth/mgmt.c | |
| parent | 80a1e1dbf62a08984d4c1bfb5a4bca38c3e1664f (diff) | |
| parent | 6f5ef998b7b0b1bf1471654bf6176a5419197128 (diff) | |
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, | |||
| 1389 | if (!hdev) | 1389 | if (!hdev) |
| 1390 | return cmd_status(sk, index, mgmt_op, ENODEV); | 1390 | return cmd_status(sk, index, mgmt_op, ENODEV); |
| 1391 | 1391 | ||
| 1392 | hci_dev_lock_bh(hdev); | ||
| 1393 | |||
| 1392 | if (!test_bit(HCI_UP, &hdev->flags)) { | 1394 | if (!test_bit(HCI_UP, &hdev->flags)) { |
| 1393 | err = cmd_status(sk, index, mgmt_op, ENETDOWN); | 1395 | err = cmd_status(sk, index, mgmt_op, ENETDOWN); |
| 1394 | goto failed; | 1396 | goto failed; |