| commit | 8f09687a1e53c4367291751639664daf4cf76cd5 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Sat Sep 15 12:09:53 2012 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sat Sep 15 12:09:51 2012 -0700 |
| tree | c1ba19dae11254a8dd887d1c4ffa7ca5abddd07d | |
| parent | c571150d9c61495b5c2878d52d6a48eac5959944 [diff] | |
| parent | 11bca60ee85331a046d6f3b2a5b6fd3a3dcd2ccc [diff] |
Merge "gpu: ion: Return error value when iommu map fails"
diff --git a/drivers/gpu/ion/ion.c b/drivers/gpu/ion/ion.c index 31bbb1f..eb9598a 100644 --- a/drivers/gpu/ion/ion.c +++ b/drivers/gpu/ion/ion.c
@@ -701,6 +701,8 @@ if (iommu_map->flags & ION_IOMMU_UNMAP_DELAYED) kref_get(&iommu_map->ref); + } else { + ret = PTR_ERR(iommu_map); } } else { if (iommu_map->flags != iommu_flags) {