3 files changed, 5 insertions, 8 deletions

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 8303f1c9ef54..c52f091ee6de 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));
 
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 4f170a595934..83acd164d39e 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -168,9 +168,8 @@ static int hci_sock_release(struct socket *sock)
 struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr)
 {
         struct list_head *p;
-        struct bdaddr_list *blacklist = &hdev->blacklist;
 
-        list_for_each(p, &blacklist->list) {
+        list_for_each(p, &hdev->blacklist) {
                 struct bdaddr_list *b;
 
                 b = list_entry(p, struct bdaddr_list, list);
@@ -202,7 +201,7 @@ static int hci_blacklist_add(struct hci_dev *hdev, void __user *arg)
 
         bacpy(&entry->bdaddr, &bdaddr);
 
-        list_add(&entry->list, &hdev->blacklist.list);
+        list_add(&entry->list, &hdev->blacklist);
 
         return 0;
 }
@@ -210,9 +209,8 @@ static int hci_blacklist_add(struct hci_dev *hdev, void __user *arg)
 int hci_blacklist_clear(struct hci_dev *hdev)
 {
         struct list_head *p, *n;
-        struct bdaddr_list *blacklist = &hdev->blacklist;
 
-        list_for_each_safe(p, n, &blacklist->list) {
+        list_for_each_safe(p, n, &hdev->blacklist) {
                 struct bdaddr_list *b;
 
                 b = list_entry(p, struct bdaddr_list, list);
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index ce44c47eeac1..8fb967beee80 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -439,12 +439,11 @@ static const struct file_operations inquiry_cache_fops = {
 static int blacklist_show(struct seq_file *f, void *p)
 {
         struct hci_dev *hdev = f->private;
-        struct bdaddr_list *blacklist = &hdev->blacklist;
         struct list_head *l;
 
         hci_dev_lock_bh(hdev);
 
-        list_for_each(l, &blacklist->list) {
+        list_for_each(l, &hdev->blacklist) {
                 struct bdaddr_list *b;
                 bdaddr_t bdaddr;