diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-05 15:54:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-05 15:54:28 -0400 |
| commit | c0068c85897f06205d4c35cf4bf9161be90690e9 (patch) | |
| tree | ae8a186fff44a29454008a5d1f5891b10a861f2c /net/bluetooth/hci_core.c | |
| parent | 2411054ae9eb7e7ef488a39912abfc4ebadbe3ad (diff) | |
| parent | adb08edea0119f7a5484a9f6a385fbcecdf85a63 (diff) | |
| download | kernel_samsung_smdk4412-c0068c85897f06205d4c35cf4bf9161be90690e9.zip kernel_samsung_smdk4412-c0068c85897f06205d4c35cf4bf9161be90690e9.tar.gz kernel_samsung_smdk4412-c0068c85897f06205d4c35cf4bf9161be90690e9.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 8303f1c..c52f091 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -924,7 +924,7 @@ int hci_register_dev(struct hci_dev *hdev) hci_conn_hash_init(hdev); - INIT_LIST_HEAD(&hdev->blacklist.list); + INIT_LIST_HEAD(&hdev->blacklist); memset(&hdev->stat, 0, sizeof(struct hci_dev_stats)); |