1 files changed, 8 insertions, 7 deletions

diff --git a/arch/arm/plat-omap/include/mach/memory.h b/arch/arm/plat-omap/include/mach/memory.h
index 037486c5f4a..a325caf80d0 100644
--- a/arch/arm/plat-omap/include/mach/memory.h
+++ b/arch/arm/plat-omap/include/mach/memory.h
@@ -76,13 +76,14 @@
                                         (dma_addr_t)virt_to_lbus(page_address(page)) : \
                                         (dma_addr_t)__virt_to_bus(page_address(page));})
 
-#define __arch_dma_to_virt(dev, addr)   ({is_lbus_device(dev) ? \
-                                        lbus_to_virt(addr) : \
-                                        __bus_to_virt(addr);})
-
-#define __arch_virt_to_dma(dev, addr)   ({is_lbus_device(dev) ? \
-                                        virt_to_lbus(addr) : \
-                                        __virt_to_bus(addr);})
+#define __arch_dma_to_virt(dev, addr)   ({ (void *) (is_lbus_device(dev) ? \
+                                                lbus_to_virt(addr) : \
+                                                __bus_to_virt(addr)); })
+
+#define __arch_virt_to_dma(dev, addr)   ({ unsigned long __addr = (unsigned long)(addr); \
+                                           (dma_addr_t) (is_lbus_device(dev) ? \
+                                                virt_to_lbus(__addr) : \
+                                                __virt_to_bus(__addr)); })
 
 #endif  /* CONFIG_ARCH_OMAP15XX */