bcma: fix unregistration of cores

gluedig · gregkh · commit 44b977a87305 · 2012-10-31T10:03:02.000-07:00
commit 1fffa90 upstream. When cores are unregistered, entries need to be removed from cores list in a safe manner. Reported-by: Stanislaw Gruszka <sgruszka@redhat.com> Reviewed-by: Arend Van Spriel <arend@broadcom.com> Signed-off-by: Piotr Haber <phaber@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
@@ -131,9 +131,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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -131,9 +131,10 @@ static int bcma_register_cores(struct bcma_bus *bus)`
`131`	`131`
`132`	`132`	`static void bcma_unregister_cores(struct bcma_bus *bus)`
`133`	`133`	`{`
`134`		`- struct bcma_device *core;`
	`134`	`+ struct bcma_device core, tmp;`
`135`	`135`
`136`		`- list_for_each_entry(core, &bus->cores, list) {`
	`136`	`+ list_for_each_entry_safe(core, tmp, &bus->cores, list) {`
	`137`	`+ list_del(&core->list);`
`137`	`138`	`if (core->dev_registered)`
`138`	`139`	`device_unregister(&core->dev);`
`139`	`140`	`}`