summaryrefslogtreecommitdiff
path: root/net/bluetooth/hci_sysfs.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-08-06 13:30:43 -0700
committerDavid S. Miller <davem@davemloft.net>2010-08-06 13:30:43 -0700
commite225567960db50e9810a152c8621c7a6ed94de71 (patch)
treed0129e2988f8aea56d4f00f04c4818c2e8cc07a2 /net/bluetooth/hci_sysfs.c
parent4b030d4288a569d6bdeca884d7f102d951f097f2 (diff)
parenta24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/bluetooth/hci_sysfs.c')
-rw-r--r--net/bluetooth/hci_sysfs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index ce44c47eeac..8fb967beee8 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;