diff options
Diffstat (limited to 'drivers/pci/controller/pci-hyperv.c')
| -rw-r--r-- | drivers/pci/controller/pci-hyperv.c | 13 | 
1 files changed, 10 insertions, 3 deletions
| diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index eaec915ffe62..67c46e52c0dc 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -3301,9 +3301,17 @@ static int hv_pci_bus_exit(struct hv_device *hdev, bool keep_devs)  		return 0;  	if (!keep_devs) { -		/* Delete any children which might still exist. */ +		struct list_head removed; + +		/* Move all present children to the list on stack */ +		INIT_LIST_HEAD(&removed);  		spin_lock_irqsave(&hbus->device_list_lock, flags); -		list_for_each_entry_safe(hpdev, tmp, &hbus->children, list_entry) { +		list_for_each_entry_safe(hpdev, tmp, &hbus->children, list_entry) +			list_move_tail(&hpdev->list_entry, &removed); +		spin_unlock_irqrestore(&hbus->device_list_lock, flags); + +		/* Remove all children in the list */ +		list_for_each_entry_safe(hpdev, tmp, &removed, list_entry) {  			list_del(&hpdev->list_entry);  			if (hpdev->pci_slot)  				pci_destroy_slot(hpdev->pci_slot); @@ -3311,7 +3319,6 @@ static int hv_pci_bus_exit(struct hv_device *hdev, bool keep_devs)  			put_pcichild(hpdev);  			put_pcichild(hpdev);  		} -		spin_unlock_irqrestore(&hbus->device_list_lock, flags);  	}  	ret = hv_send_resources_released(hdev); |