diff --git a/[refs] b/[refs] index b2bbc9910fce..5a53b62c559b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e568536d94256819f17662c26c82a42e44a7a7c +refs/heads/master: eaf7943cc53d9688aa10267a226165356e956ec5 diff --git a/trunk/include/asm-mips/mach-ip27/dma-coherence.h b/trunk/include/asm-mips/mach-ip27/dma-coherence.h index 3fdbbf68e952..ed7e6222dc15 100644 --- a/trunk/include/asm-mips/mach-ip27/dma-coherence.h +++ b/trunk/include/asm-mips/mach-ip27/dma-coherence.h @@ -35,7 +35,7 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr) { - return dma_addr & (0xffUL << 56); + return dma_addr & ~(0xffUL << 56); } static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)