mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
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
This commit is contained in:
commit
9b34f40c20
13 changed files with 99 additions and 94 deletions
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue