summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchel Humpherys <mitchelh@codeaurora.org>2015-04-02 12:41:37 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:11:53 -0700
commit0c8a3a1a3dc651d06573209fc5d8c0d4fed33c47 (patch)
tree117e06d150b272b8e40dcd2256a07b23829c3e2d
parenta4c8bee14072cc665ca7224dcda9b32b28c29985 (diff)
arm64: dma-mapping: use ERR_PTR instead of NULL in stub
The real arm_iommu_create_mapping function returns an ERR_PTR (not NULL) on failure. Make the stub version match that convention. Change-Id: I1df954ee5b9037778f27fba2e626621740abf782 Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
-rw-r--r--arch/arm64/include/asm/dma-iommu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/dma-iommu.h b/arch/arm64/include/asm/dma-iommu.h
index 4bba210fb51a..db51643163f2 100644
--- a/arch/arm64/include/asm/dma-iommu.h
+++ b/arch/arm64/include/asm/dma-iommu.h
@@ -40,7 +40,7 @@ static inline struct dma_iommu_mapping *
arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size,
int order)
{
- return NULL;
+ return ERR_PTR(-ENOMEM);
}
static inline void arm_iommu_release_mapping(struct dma_iommu_mapping *mapping)