From 3df02a60a8a54d3e322ae18ac7d658d0a680ff50 Mon Sep 17 00:00:00 2001 From: Hartley Sweeten Date: Mon, 14 Jun 2010 16:54:16 +0100 Subject: [PATCH] --- yaml --- r: 201409 b: refs/heads/master c: a0fb007bf0c7de9ae361a9ad3821df4c69d4d2d9 h: refs/heads/master i: 201407: c53f26cec60ce699d8d72fed419b3b0d592936fa v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ep93xx/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5ec1fec9e918..086dae7adb8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16bcf78f8cac9cc3057c6ce3800490cb6e684ce8 +refs/heads/master: a0fb007bf0c7de9ae361a9ad3821df4c69d4d2d9 diff --git a/trunk/arch/arm/mach-ep93xx/core.c b/trunk/arch/arm/mach-ep93xx/core.c index f4b25bf00b64..8e37a045188c 100644 --- a/trunk/arch/arm/mach-ep93xx/core.c +++ b/trunk/arch/arm/mach-ep93xx/core.c @@ -216,8 +216,8 @@ void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits) spin_lock_irqsave(&syscon_swlock, flags); val = __raw_readl(EP93XX_SYSCON_DEVCFG); - val |= set_bits; val &= ~clear_bits; + val |= set_bits; __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); __raw_writel(val, EP93XX_SYSCON_DEVCFG);