diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-09-23 13:22:00 +0000 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-09-23 13:22:00 +0000 |
| commit | cfb0ae67faf0630806e9b3775448521b9b25b66d (patch) | |
| tree | 0cf03378772ba2d00e557d1d88166361e6fc9414 /drivers/xen/xen-pciback/pci_stub.c | |
| parent | 8c468766a1521b33b55a21d518638c60989599c0 (diff) | |
| parent | 27eb7634a69774beee6743fdf70d431e502b9e9f (diff) | |
| download | linux-cfb0ae67faf0630806e9b3775448521b9b25b66d.tar.gz | |
Merge remote-tracking branch 'pci/next' into ct-mcr-1/danielsilverstone/jetson-genivi
Diffstat (limited to 'drivers/xen/xen-pciback/pci_stub.c')
| -rw-r--r-- | drivers/xen/xen-pciback/pci_stub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index 259ba2661543..017069a455d4 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c @@ -133,7 +133,7 @@ static void pcistub_device_release(struct kref *kref) xen_pcibk_config_free_dyn_fields(dev); xen_pcibk_config_free_dev(dev); - dev->dev_flags &= ~PCI_DEV_FLAGS_ASSIGNED; + pci_clear_dev_assigned(dev); pci_dev_put(dev); kfree(psdev); @@ -413,7 +413,7 @@ static int 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; + pci_set_dev_assigned(dev); return 0; config_release: |