diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-01 17:15:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-01 17:15:25 -0700 |
| commit | 5e58e5283a0a0a99ee970e7e5c80c6541693376e (patch) | |
| tree | 40409bad22ddc6c37b23ae8e518bbd6b2f39007c /net/bluetooth/mgmt.c | |
| parent | c100c8f4c3c6f2a407bdbaaad2c4f1062e6a473a (diff) | |
| parent | ffd8c746fbef50cf12df239f9d23c2afe1a2c3cb (diff) | |
| download | linux-5e58e5283a0a0a99ee970e7e5c80c6541693376e.tar.gz linux-5e58e5283a0a0a99ee970e7e5c80c6541693376e.tar.bz2 linux-5e58e5283a0a0a99ee970e7e5c80c6541693376e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 0054c74e27b7..4476d8e3c0f2 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1230,6 +1230,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; |