From 6febf769cd06f79f231205c22cf47f2010fe5a0b Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Thu, 2 Feb 2012 10:32:18 +0200 Subject: [PATCH] --- yaml --- r: 290915 b: refs/heads/master c: 2a5a5ec620a29d4ba07743c3151cdf0a417c8f8c h: refs/heads/master i: 290913: 7d7cd8bee970a0609e88753c02114266913c77df 290911: f7fbdf40461929127b2f49731ef9c3a5552edc8a v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_conn.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9aad51f9805e..a9cbf1db8e73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c4e0df028935618d052235ba85bc7079be13394 +refs/heads/master: 2a5a5ec620a29d4ba07743c3151cdf0a417c8f8c diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c index b074bd698cf6..b4ecddee11b5 100644 --- a/trunk/net/bluetooth/hci_conn.c +++ b/trunk/net/bluetooth/hci_conn.c @@ -975,10 +975,10 @@ int hci_chan_del(struct hci_chan *chan) void hci_chan_list_flush(struct hci_conn *conn) { - struct hci_chan *chan; + struct hci_chan *chan, *n; BT_DBG("conn %p", conn); - list_for_each_entry_rcu(chan, &conn->chan_list, list) + list_for_each_entry_safe(chan, n, &conn->chan_list, list) hci_chan_del(chan); }