Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / drivers / xen / xen-pciback / xenbus.c

diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
index 474d52ec3374f5025f51bda1190257a5132af771..075525945e36d406c15f2598e7c0b0e4f8e43385 100644 (file)
--- a/drivers/xen/xen-pciback/xenbus.c
+++ b/drivers/xen/xen-pciback/xenbus.c
@@ -241,6 +241,7 @@ static int xen_pcibk_export_device(struct xen_pcibk_device *pdev,
                goto out;
 
        dev_dbg(&dev->dev, "registering for %d\n", pdev->xdev->otherend_id);
+       dev->dev_flags |= PCI_DEV_FLAGS_ASSIGNED;
        if (xen_register_device_domain_owner(dev,
                                             pdev->xdev->otherend_id) != 0) {
                dev_err(&dev->dev, "device has been assigned to another " \
@@ -280,6 +281,7 @@ static int xen_pcibk_remove_device(struct xen_pcibk_device *pdev,
        }
 
        dev_dbg(&dev->dev, "unregistering for %d\n", pdev->xdev->otherend_id);
+       dev->dev_flags &= ~PCI_DEV_FLAGS_ASSIGNED;
        xen_unregister_device_domain_owner(dev);
 
        xen_pcibk_release_pci_dev(pdev, dev);