---

yaml --- r: 334826 b: refs/heads/master c: 871ae57 h: refs/heads/master v: v3
git-mirror · Oct 23, 2012 · 92c68b6 · 92c68b6
1 parent 0a7f739
commit 92c68b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1f102136538553a9488c713a336065ebb567542
+refs/heads/master: 871ae57adc5ed092c1341f411514d0e8482e2611
diff --git 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;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
      */
     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;
     }
@@ Expand Down @@