| commit | 0f03b233673e3170b5d5e68e2eca6c44ffe7e4fc | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Mar 25 11:45:46 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Mar 25 11:45:46 2013 -0700 |
| tree | 737d5a3dfc276bf33c5c315876536b0cc93d841f | |
| parent | 5cdd516b05c38fed091ced752b4098bfe5014142 [diff] | |
| parent | e783721bc039dc93abdb01655e009ce3c766677e [diff] |
Merge "iommu: msm: Check for failed allocation"
diff --git a/arch/arm/mach-msm/iommu_domains.c b/arch/arm/mach-msm/iommu_domains.c index 5228abc..68ecdc8 100644 --- a/arch/arm/mach-msm/iommu_domains.c +++ b/arch/arm/mach-msm/iommu_domains.c
@@ -431,6 +431,8 @@ data->npools = layout->npartitions; data->domain_num = atomic_inc_return(&domain_nums); data->domain = iommu_domain_alloc(bus, layout->domain_flags); + if (!data->domain) + goto out; add_domain(data);