1 files changed, 11 insertions, 3 deletions

diff --git a/drivers/xen/xen-pciback/vpci.c b/drivers/xen/xen-pciback/vpci.c
index 51afff96c515..c99f8bb1c56c 100644
--- a/drivers/xen/xen-pciback/vpci.c
+++ b/drivers/xen/xen-pciback/vpci.c
@@ -145,7 +145,7 @@ out:
 }
 
 static void __xen_pcibk_release_pci_dev(struct xen_pcibk_device *pdev,
-                                        struct pci_dev *dev)
+                                        struct pci_dev *dev, bool lock)
 {
         int slot;
         struct vpci_dev_data *vpci_dev = pdev->pci_dev_data;
@@ -169,8 +169,13 @@ static void __xen_pcibk_release_pci_dev(struct xen_pcibk_device *pdev,
 out:
         mutex_unlock(&vpci_dev->lock);
 
-        if (found_dev)
+        if (found_dev) {
+                if (lock)
+                        device_lock(&found_dev->dev);
                 pcistub_put_pci_dev(found_dev);
+                if (lock)
+                        device_unlock(&found_dev->dev);
+        }
 }
 
 static int __xen_pcibk_init_devices(struct xen_pcibk_device *pdev)
@@ -208,8 +213,11 @@ static void __xen_pcibk_release_devices(struct xen_pcibk_device *pdev)
                 struct pci_dev_entry *e, *tmp;
                 list_for_each_entry_safe(e, tmp, &vpci_dev->dev_list[slot],
                                          list) {
+                        struct pci_dev *dev = e->dev;
                         list_del(&e->list);
-                        pcistub_put_pci_dev(e->dev);
+                        device_lock(&dev->dev);
+                        pcistub_put_pci_dev(dev);
+                        device_unlock(&dev->dev);
                         kfree(e);
                 }
         }