diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-04 22:46:34 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-04 22:46:34 +0400 |
| commit | 22097fd297c85ec6c2e700d506f231f7cae442e1 (patch) | |
| tree | 4a16a6821c5dc82a512b56ade6fcf64e0935d0aa /net/bluetooth/mgmt.c | |
| parent | 1a67a573b8d9f02211f36fbab50f6265dc49384a (diff) | |
| parent | 54d5026e7c173edae8a27c293c286f1783d21ae8 (diff) | |
| download | linux-22097fd297c85ec6c2e700d506f231f7cae442e1.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 5a94eec06caa..5caff4d47596 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -147,8 +147,6 @@ static int read_index_list(struct sock *sk) hci_del_off_timer(d); - set_bit(HCI_MGMT, &d->flags); - if (test_bit(HCI_SETUP, &d->flags)) continue; |