diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-12-07 17:02:47 (GMT) |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-12-07 17:02:47 (GMT) |
commit | 7730cba2a50332c194f50a58b86359ea39a82bd1 (patch) | |
tree | 64c8d7228da1454c02288068e57a9c61f8b0acd0 /drivers/iommu | |
parent | c20151dff8a6d503c0d0cc4387c33a618cdabcb7 (diff) | |
parent | b69f0859dc8e633c5d8c06845811588fe17e68b3 (diff) | |
download | linux-7730cba2a50332c194f50a58b86359ea39a82bd1.tar.xz |
Merge tag 'v3.7-rc8' into spi/next
Linux 3.7-rc8
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/intel-iommu.c | 4 | ||||
-rw-r--r-- | drivers/iommu/tegra-smmu.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index d4a4cd4..0badfa4 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); diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index a649f14..c0f7a42 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -1054,6 +1054,7 @@ static int smmu_debugfs_stats_show(struct seq_file *s, void *v) stats[i], val, offs); } seq_printf(s, "\n"); + dput(dent); return 0; } |