aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2013-02-18 14:19:53 -0800
committerPiotr Esden-Tempski2013-02-18 14:19:53 -0800
commit46263e90b41abd26d3b274a315d2237308db91a4 (patch)
tree3b77601940fb971aa45fde2007d270f9ba9ff806
parentb4634ba8fff09f73bf4598ae75e99d45e7b95126 (diff)
parente20ef7a416b12a140ceb15bf00c29378c44a7ad3 (diff)
Merge pull request #88 "Fix logical operator error in tim_ic_set_input reported by hmjack2008"
Merge remote-tracking branch 'ksarkies/timer'
-rw-r--r--lib/stm32/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stm32/timer.c b/lib/stm32/timer.c
index d3c26e8..1a346ef 100644
--- a/lib/stm32/timer.c
+++ b/lib/stm32/timer.c
@@ -1913,7 +1913,7 @@ void timer_ic_set_input(u32 timer_peripheral, enum tim_ic_id ic, enum tim_ic_inp
in &= 3;
if (((ic == TIM_IC2) || (ic == TIM_IC4)) &&
- ((in == TIM_IC_IN_TI1) || (in = TIM_IC_IN_TI2))) {
+ ((in == TIM_IC_IN_TI1) || (in == TIM_IC_IN_TI2))) {
/* Input select bits are flipped for these combinations */
in ^= 3;
}