summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-30 02:36:15 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-30 02:36:15 +0100
commit89307babf966165171547f105e2253dec261cfa5 (patch)
tree74225500fcdf8ca4f11dcfa3e54738cdd33702f0 /drivers/iommu
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentiommu: Initialize domain->handler in iommu_domain_alloc() (diff)
downloadlinux-89307babf966165171547f105e2253dec261cfa5.tar.xz
linux-89307babf966165171547f105e2253dec261cfa5.zip
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu: Initialize domain->handler in iommu_domain_alloc()
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 2fb2963df553..5b5fa5cdaa31 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -90,7 +90,7 @@ struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
if (bus == NULL || bus->iommu_ops == NULL)
return NULL;
- domain = kmalloc(sizeof(*domain), GFP_KERNEL);
+ domain = kzalloc(sizeof(*domain), GFP_KERNEL);
if (!domain)
return NULL;