diff --git a/drivers/mtd/nand/nand-bb.c b/drivers/mtd/nand/nand-bb.c
index f387ef6..89d5945 100644
--- a/drivers/mtd/nand/nand-bb.c
+++ b/drivers/mtd/nand/nand-bb.c
@@ -308,9 +308,9 @@
 
 int dev_remove_bb_dev(const char *name)
 {
-	struct nand_bb *bb;
+	struct nand_bb *bb, *tmp;
 
-	list_for_each_entry(bb, &bb_list, list) {
+	list_for_each_entry_safe(bb, tmp, &bb_list, list) {
 		if (!strcmp(bb->cdev.name, name)) {
 			devfs_remove(&bb->cdev);
 			cdev_close(bb->cdev_parent);