From: Maxime Bizon <mbizon@freebox.fr>
Date: Fri, 31 Aug 2007 09:03:14 +0000 (+0200)
Subject: [MIPS] R10000: Fix wrong test in dma-default.c
X-Git-Tag: v2.6.23-rc7~95^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bce4e9de113e2957c74cc4ce36fbd6eff47d24d;p=linux-2.6

[MIPS] R10000: Fix wrong test in dma-default.c

Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 76903c7276..f60b3dc0fc 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -35,7 +35,7 @@ static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
 static inline int cpu_is_noncoherent_r10000(struct device *dev)
 {
 	return !plat_device_is_coherent(dev) &&
-	       (current_cpu_data.cputype == CPU_R10000 &&
+	       (current_cpu_data.cputype == CPU_R10000 ||
 	       current_cpu_data.cputype == CPU_R12000);
 }