diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-24 08:27:09 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-24 08:27:09 -0600 |
| commit | 38dac981e0d31bcbc760e6499f6b4aa7c7ef9b29 (patch) | |
| tree | 8c654407d07d852a955369bda5566609ea2c2642 | |
| parent | 54471556e62b7d627578a5cbfbc3c690cdb4eef5 (diff) | |
| download | nuttx-38dac981e0d31bcbc760e6499f6b4aa7c7ef9b29.tar.gz nuttx-38dac981e0d31bcbc760e6499f6b4aa7c7ef9b29.tar.bz2 nuttx-38dac981e0d31bcbc760e6499f6b4aa7c7ef9b29.zip | |
STM32 PWM and ADC: Add some bits that should have been cleared. From Martin Lederhilger
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_adc.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_pwm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_adc.c b/nuttx/arch/arm/src/stm32/stm32_adc.c index ec895bbe5..ab876966d 100644 --- a/nuttx/arch/arm/src/stm32/stm32_adc.c +++ b/nuttx/arch/arm/src/stm32/stm32_adc.c @@ -772,7 +772,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv) #if defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX) else { - ccer &= ~(GTIM_CCER_CC1NP | GTIM_CCER_CC2NP | GTIM_CCER_CC3NP | GTIM_CCER_CC4NP); + ccer &= ~(GTIM_CCER_CC1NP | GTIM_CCER_CC2NP | GTIM_CCER_CC3NP); } #endif diff --git a/nuttx/arch/arm/src/stm32/stm32_pwm.c b/nuttx/arch/arm/src/stm32/stm32_pwm.c index c1279435e..f9d36af7a 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pwm.c +++ b/nuttx/arch/arm/src/stm32/stm32_pwm.c @@ -896,7 +896,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv, #endif #if defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX) { - ccer &= ~(GTIM_CCER_CC1NP | GTIM_CCER_CC2NP | GTIM_CCER_CC3NP | GTIM_CCER_CC4NP); + ccer &= ~(GTIM_CCER_CC1NP | GTIM_CCER_CC2NP | GTIM_CCER_CC3NP); } #endif |