diff options
| author | John W. Linville | 2012-10-23 11:41:46 -0400 |
|---|---|---|
| committer | John W. Linville | 2012-10-23 11:41:46 -0400 |
| commit | 9b34f40c20111ba658f88e1669598db494be1fbc (patch) | |
| tree | be98189b178ca63a44c09c8a5e92574a92932b51 /drivers/bcma | |
| parent | 9917c85b06c2eb9d61c0f2dadd2d5d8788f7e563 (diff) | |
| parent | 290eddc4b3661dc4dfa95d199e0be5788928b3b1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
net/mac80211/mlme.c
Diffstat (limited to 'drivers/bcma')
| -rw-r--r-- | drivers/bcma/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 7f473cf0469e..a9718893000b 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c @@ -170,9 +170,10 @@ static int bcma_register_cores(struct bcma_bus *bus) static void bcma_unregister_cores(struct bcma_bus *bus) { - struct bcma_device *core; + struct bcma_device *core, *tmp; - list_for_each_entry(core, &bus->cores, list) { + list_for_each_entry_safe(core, tmp, &bus->cores, list) { + list_del(&core->list); if (core->dev_registered) device_unregister(&core->dev); } |