Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

[~andy/linux] / drivers / bcma / scan.c

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 6621b2221b4084d8ecbbfc275a2231bd8a74f554..f94cccccfa56fc94a2e0b2cf454b30afd3864855 100644 (file)
--- 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++;