git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[sfrench/cifs-2.6.git]
/
drivers
/
pci
/
intel-iommu.c
diff --git
a/drivers/pci/intel-iommu.c
b/drivers/pci/intel-iommu.c
index bb0642318a959453e9ef0c68190070ac7d9290a4..3f7b81c065d25188e17d82665b63575a91c92e19 100644
(file)
--- 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;
}