From 738cef83b2178d77c62e97bf84576d4b3daa2e04 Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Mon, 22 Oct 2012 20:44:03 +0800 Subject: [PATCH] --- yaml --- r: 347494 b: refs/heads/master c: a0157573041403e7507a6f3f32279fc14ff5c02e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/dma-mapping.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3e604f3565e3..c058ada54cea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd78a95ac662a18e94509b7314c327475cbeafb4 +refs/heads/master: a0157573041403e7507a6f3f32279fc14ff5c02e diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h index 23004847bb05..78d8e9b5544f 100644 --- a/trunk/arch/arm/include/asm/dma-mapping.h +++ b/trunk/arch/arm/include/asm/dma-mapping.h @@ -91,6 +91,7 @@ static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) */ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { + debug_dma_mapping_error(dev, dma_addr); return dma_addr == DMA_ERROR_CODE; }