]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: pxa: fix warning in zeus.c
authorMarek Vasut <marek.vasut@gmail.com>
Sun, 9 Jan 2011 23:29:02 +0000 (00:29 +0100)
committerEric Miao <eric.y.miao@gmail.com>
Fri, 14 Jan 2011 16:21:02 +0000 (10:21 -0600)
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
arch/arm/mach-pxa/zeus.c

index a894770d203bf72c63538358246aa147392a8ecf..f4b053b35815495aec494f7396888f4cf8db7758 100644 (file)
@@ -830,8 +830,8 @@ static void __init zeus_init(void)
        pr_info("Zeus CPLD V%dI%d\n", (system_rev & 0xf0) >> 4, (system_rev & 0x0f));
 
        /* Fix timings for dm9000s (CS1/CS2)*/
-       msc0 = __raw_readl(MSC0) & 0x0000ffff | (dm9000_msc << 16);
-       msc1 = __raw_readl(MSC1) & 0xffff0000 | dm9000_msc;
+       msc0 = (__raw_readl(MSC0) & 0x0000ffff) | (dm9000_msc << 16);
+       msc1 = (__raw_readl(MSC1) & 0xffff0000) | dm9000_msc;
        __raw_writel(msc0, MSC0);
        __raw_writel(msc1, MSC1);