diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2012-11-13 10:22:03 -0700 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2012-11-17 13:27:15 +0100 |
| commit | 3da4af0affbb797e8ac4c2b4598da0c34b8cc52a (patch) | |
| tree | cf111010189531f3846b4f30476102c3f69c8f34 /drivers/iommu | |
| parent | b334b64862efd0eee8d07f2faabbe4b56ee974cd (diff) | |
| download | linux-3da4af0affbb797e8ac4c2b4598da0c34b8cc52a.tar.gz linux-3da4af0affbb797e8ac4c2b4598da0c34b8cc52a.tar.bz2 linux-3da4af0affbb797e8ac4c2b4598da0c34b8cc52a.zip | |
intel-iommu: Fix lookup in add device
We can't assume this device exists, fall back to the bridge itself.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Tested-by: Matthew Thode <prometheanfire@gentoo.org>
Cc: stable@vger.kernel.org
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index d4a4cd445cab..0badfa48b32b 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -4108,7 +4108,7 @@ static void swap_pci_ref(struct pci_dev **from, struct pci_dev *to) static int intel_iommu_add_device(struct device *dev) { struct pci_dev *pdev = to_pci_dev(dev); - struct pci_dev *bridge, *dma_pdev; + struct pci_dev *bridge, *dma_pdev = NULL; struct iommu_group *group; int ret; @@ -4122,7 +4122,7 @@ static int intel_iommu_add_device(struct device *dev) dma_pdev = pci_get_domain_bus_and_slot( pci_domain_nr(pdev->bus), bridge->subordinate->number, 0); - else + if (!dma_pdev) dma_pdev = pci_dev_get(bridge); } else dma_pdev = pci_dev_get(pdev); |