brcm47xx: fix memory leak, backport from the mainline kernel

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31143 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-03-29 15:44:06 +00:00 · 2012-03-29 15:44:06 +00:00 · 88b3c3aad1
parent e0329692de
commit 88b3c3aad1
1 changed files with 29 additions and 0 deletions
--- a/target/linux/brcm47xx/patches-3.2/235-bcma-fix-memleak.patch
+++ b/target/linux/brcm47xx/patches-3.2/235-bcma-fix-memleak.patch
@ -0,0 +1,29 @@
+--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
+@@ -458,15 +458,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++;