summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorWei Yang <richard.weiyang@gmail.com>2016-07-13 13:53:21 +0000
committerJoerg Roedel <jroedel@suse.de>2016-07-14 10:26:30 +0200
commit5c365d18a73d3979db37006eaacefc0008869c0f (patch)
tree2fdf5f635268375ad86b53c58d0266cdf4992d93 /drivers/iommu
parent452014d2b4824ed9ca32a3ef6ee745f22431132a (diff)
downloadlinux-5c365d18a73d3979db37006eaacefc0008869c0f.tar.bz2
iommu/vt-d: Return error code in domain_context_mapping_one()
In 'commit <55d940430ab9> ("iommu/vt-d: Get rid of domain->iommu_lock")', the error handling path is changed a little, which makes the function always return 0. This path fixes this. Signed-off-by: Wei Yang <richard.weiyang@gmail.com> Fixes: 55d940430ab9 ('iommu/vt-d: Get rid of domain->iommu_lock') Cc: stable@vger.kernel.org # v4.3+ Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/intel-iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 748e5e4b3144..0a97a6da407c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2076,7 +2076,7 @@ out_unlock:
spin_unlock(&iommu->lock);
spin_unlock_irqrestore(&device_domain_lock, flags);
- return 0;
+ return ret;
}
struct domain_context_mapping_data {