Merge tag 'for-linus-20151021' of git://git.infradead.org/intel-iommu

[linux-drm-fsl-dcu.git] / drivers / iommu / intel-iommu.c

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index df53855a5f3ebd4cf640ca2f814f3ab2f252b5e9..d65cf42399e8e5aa0f856a1ab6869c041adc0c48 100644 (file)
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2305,6 +2305,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
 
        if (ret) {
                spin_unlock_irqrestore(&device_domain_lock, flags);
+               free_devinfo_mem(info);
                return NULL;
        }