diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 04:14:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 04:14:56 -0400 |
| commit | 48ae74443403ab25876959e84785f61bf421ccef (patch) | |
| tree | dd6d8277f2f0e691edf49a38ff9a804f9a1532d0 /drivers/pci/intel-iommu.c | |
| parent | 1b82c9666a6f637ccb3a86d0fbe23d0427076815 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/step
Diffstat (limited to 'drivers/pci/intel-iommu.c')
| -rw-r--r-- | drivers/pci/intel-iommu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index bb0642318a95..3f7b81c065d2 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
| @@ -1748,7 +1748,6 @@ int __init init_dmars(void) | |||
| 1748 | deferred_flush = kzalloc(g_num_of_iommus * | 1748 | deferred_flush = kzalloc(g_num_of_iommus * |
| 1749 | sizeof(struct deferred_flush_tables), GFP_KERNEL); | 1749 | sizeof(struct deferred_flush_tables), GFP_KERNEL); |
| 1750 | if (!deferred_flush) { | 1750 | if (!deferred_flush) { |
| 1751 | kfree(g_iommus); | ||
| 1752 | ret = -ENOMEM; | 1751 | ret = -ENOMEM; |
| 1753 | goto error; | 1752 | goto error; |
| 1754 | } | 1753 | } |