From ea4a2d25be4387fe2c193c50058bfe07c39f6dad Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Wed, 4 Jan 2012 14:10:32 -0500 Subject: [PATCH] --- yaml --- r: 282103 b: refs/heads/master c: 97309d3974fd371920cc8b932e2b6b5e4100c7c6 h: refs/heads/master i: 282101: 8260839d6e5934fa861d8819ea2f26095f3e78fa 282099: 38648f95c5fb57da6f20001df4403a2f81183398 282095: 14752cc86b5629890e543ec0c9543e6a634000f8 v: v3 --- [refs] | 2 +- trunk/drivers/xen/xen-pciback/pci_stub.c | 2 ++ trunk/drivers/xen/xen-pciback/xenbus.c | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 19d9c6f3a12c..df8190473777 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a800651e8893007d3a12bc281f0265f18043c4fa +refs/heads/master: 97309d3974fd371920cc8b932e2b6b5e4100c7c6 diff --git a/trunk/drivers/xen/xen-pciback/pci_stub.c b/trunk/drivers/xen/xen-pciback/pci_stub.c index 8f06e1ed028c..405445965690 100644 --- a/trunk/drivers/xen/xen-pciback/pci_stub.c +++ b/trunk/drivers/xen/xen-pciback/pci_stub.c @@ -99,6 +99,7 @@ static void pcistub_device_release(struct kref *kref) kfree(pci_get_drvdata(psdev->dev)); pci_set_drvdata(psdev->dev, NULL); + psdev->dev->dev_flags &= ~PCI_DEV_FLAGS_ASSIGNED; pci_dev_put(psdev->dev); kfree(psdev); @@ -331,6 +332,7 @@ static int __devinit pcistub_init_device(struct pci_dev *dev) dev_dbg(&dev->dev, "reset device\n"); xen_pcibk_reset_device(dev); + dev->dev_flags |= PCI_DEV_FLAGS_ASSIGNED; return 0; config_release: diff --git a/trunk/drivers/xen/xen-pciback/xenbus.c b/trunk/drivers/xen/xen-pciback/xenbus.c index c80f9c84d08e..87c5dc3368d0 100644 --- a/trunk/drivers/xen/xen-pciback/xenbus.c +++ b/trunk/drivers/xen/xen-pciback/xenbus.c @@ -241,7 +241,6 @@ 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 " \ @@ -281,7 +280,6 @@ 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);