---

yaml --- r: 347487 b: refs/heads/master c: ad15488 h: refs/heads/master i: 347485: be1c0bf 347483: b6ebffc 347479: 96336f7 347471: 83cc1d5 347455: b5c7486 v: v3
git-mirror · Nov 28, 2012 · 46e1a55 · 46e1a55
1 parent 59b58ba
commit 46e1a55
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: bb7c4deb82c2f0b278cdf45a392a3ed9479cdbbe
+refs/heads/master: ad154880c03daf1f776e502e2c18775eda4280d2
diff --git a/trunk/arch/c6x/include/asm/dma-mapping.h b/trunk/arch/c6x/include/asm/dma-mapping.h
@@ -32,6 +32,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
  */
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
+	debug_dma_mapping_error(dev, dma_addr);
 	return dma_addr == ~0;
 }
-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 == ~0;
     }
@@ Expand Down @@