summaryrefslogtreecommitdiffstats
path: root/drivers/pci/intel-iommu.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 10:14:56 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-18 10:14:56 +0200
commit48ae74443403ab25876959e84785f61bf421ccef (patch)
treedd6d8277f2f0e691edf49a38ff9a804f9a1532d0 /drivers/pci/intel-iommu.c
parent1b82c9666a6f637ccb3a86d0fbe23d0427076815 (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
Merge branch 'linus' into x86/step
Diffstat (limited to 'drivers/pci/intel-iommu.c')
-rw-r--r--drivers/pci/intel-iommu.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index bb0642318a9..3f7b81c065d 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1748,7 +1748,6 @@ int __init init_dmars(void)
deferred_flush = kzalloc(g_num_of_iommus *
sizeof(struct deferred_flush_tables), GFP_KERNEL);
if (!deferred_flush) {
- kfree(g_iommus);
ret = -ENOMEM;
goto error;
}