From 4bdf18ad2fb68ec2e8df56738b8994526eee8acc Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 15 May 2009 22:32:31 +0000 Subject: [PATCH] back out part of last change git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1785 42af7a65-404d-4744-a932-0658087f49c3 --- arch/arm/src/lm3s/lm3s_syscontrol.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/lm3s/lm3s_syscontrol.c b/arch/arm/src/lm3s/lm3s_syscontrol.c index c8886fae3e..013b617ff3 100644 --- a/arch/arm/src/lm3s/lm3s_syscontrol.c +++ b/arch/arm/src/lm3s/lm3s_syscontrol.c @@ -210,10 +210,9 @@ void lm3s_clockconfig(uint32 newrcc, uint32 newrcc2) if (((rcc & SYSCON_RCC_MOSCDIS) && !(newrcc & SYSCON_RCC_MOSCDIS)) || ((rcc & SYSCON_RCC_IOSCDIS) && !(newrcc & SYSCON_RCC_IOSCDIS))) { - /* Enable any selected osciallators */ + /* Enable any selected osciallators (but don't disable any yet) */ - rcc &= ~RCC_OSCMASK; - rcc |= (newrcc & RCC_OSCMASK); + rcc &= (~RCC_OSCMASK | (newrcc & RCC_OSCMASK)); putreg32(rcc, LM3S_SYSCON_RCC); /* Wait for the newly selected oscillator(s) to settle. This is tricky because