static inline void delbusdevices(struct list_head *list, U32 busNo)
 {
-       VISORCHIPSET_DEVICE_INFO *p;
+       VISORCHIPSET_DEVICE_INFO *p, *tmp;
 
-       list_for_each_entry(p, list, entry) {
+       list_for_each_entry_safe(p, tmp, list, entry) {
                if (p->busNo == busNo) {
                        list_del(&p->entry);
                        kfree(p);
 
 static void
 cleanup_controlvm_structures(void)
 {
-       VISORCHIPSET_BUS_INFO *bi;
-       VISORCHIPSET_DEVICE_INFO *di;
+       VISORCHIPSET_BUS_INFO *bi, *tmp_bi;
+       VISORCHIPSET_DEVICE_INFO *di, *tmp_di;
 
-       list_for_each_entry(bi, &BusInfoList, entry) {
+       list_for_each_entry_safe(bi, tmp_bi, &BusInfoList, entry) {
                busInfo_clear(bi);
                list_del(&bi->entry);
                kfree(bi);
        }
 
-       list_for_each_entry(di, &DevInfoList, entry) {
+       list_for_each_entry_safe(di, tmp_di, &DevInfoList, entry) {
                devInfo_clear(di);
                list_del(&di->entry);
                kfree(di);