From 004c4095fd4f05d94fd721dd92107b4b1ef2ac94 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 10 Jan 2011 00:29:02 +0100 Subject: [PATCH] --- yaml --- r: 231383 b: refs/heads/master c: bc3e55c69c404158ef3c5b1a6515f5e9f1294403 h: refs/heads/master i: 231381: 3ce5e44f4cbff278815d31c594e13a4cacdacd9c 231379: caf157884433096f5179f30cba6082258bb62e5f 231375: 2e5f595ae802bb10d81663eee10d82b5ec682965 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/zeus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cdbe5e8202ec..105fe157267d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cae399880f82fdc6b0afccf42224fc2a759aa6b3 +refs/heads/master: bc3e55c69c404158ef3c5b1a6515f5e9f1294403 diff --git a/trunk/arch/arm/mach-pxa/zeus.c b/trunk/arch/arm/mach-pxa/zeus.c index a894770d203b..f4b053b35815 100644 --- a/trunk/arch/arm/mach-pxa/zeus.c +++ b/trunk/arch/arm/mach-pxa/zeus.c @@ -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);