diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /drivers/bcma | |
| parent | 12325280dfeba18164f9c47e226a40ab34e23ee7 (diff) | |
| parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
| download | linux-stable-ca994a36f585432458ead9133fcfe05440edbb7b.tar.gz linux-stable-ca994a36f585432458ead9133fcfe05440edbb7b.tar.bz2 linux-stable-ca994a36f585432458ead9133fcfe05440edbb7b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
Diffstat (limited to 'drivers/bcma')
| -rw-r--r-- | drivers/bcma/main.c | 4 | ||||
| -rw-r--r-- | drivers/bcma/scan.c | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index bcd1c01cde9e..b8379b90d045 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c @@ -179,10 +179,8 @@ int __devinit bcma_bus_register(struct bcma_bus *bus) err = bcma_sprom_get(bus); if (err == -ENOENT) { pr_err("No SPROM available\n"); - } else if (err) { + } else if (err) pr_err("Failed to get SPROM: %d\n", err); - return -ENOENT; - } /* Register found cores */ bcma_register_cores(bus); diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c index 6621b2221b40..f94cccccfa56 100644 --- a/drivers/bcma/scan.c +++ b/drivers/bcma/scan.c @@ -415,15 +415,18 @@ int bcma_bus_scan(struct bcma_bus *bus) core->bus = bus; err = bcma_get_next_core(bus, &eromptr, NULL, core_num, core); - if (err == -ENODEV) { - core_num++; - continue; - } else if (err == -ENXIO) - continue; - else if (err == -ESPIPE) - break; - else if (err < 0) + if (err < 0) { + kfree(core); + if (err == -ENODEV) { + core_num++; + continue; + } else if (err == -ENXIO) { + continue; + } else if (err == -ESPIPE) { + break; + } return err; + } core->core_index = core_num++; bus->nr_cores++; |