aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os/hal/include/adc.h2
-rw-r--r--readme.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/os/hal/include/adc.h b/os/hal/include/adc.h
index 1e3f6edc7..a236a040a 100644
--- a/os/hal/include/adc.h
+++ b/os/hal/include/adc.h
@@ -205,6 +205,8 @@ typedef enum {
if ((adcp)->state == ADC_COMPLETE) \
(adcp)->state = ADC_READY; \
} \
+ else \
+ (adcp)->state = ADC_READY; \
(adcp)->grpp = NULL; \
_adc_wakeup_isr(adcp); \
} \
diff --git a/readme.txt b/readme.txt
index f57f3d247..0f5c72a30 100644
--- a/readme.txt
+++ b/readme.txt
@@ -71,6 +71,8 @@
*****************************************************************************
*** 2.3.2 ***
+- FIX: Fixed missing state transition in ADC driver (bug 3288149)(backported
+ to 2.2.4).
- FIX: Fixed missing state transition in SPI driver (bug 3288112)(backported
to 2.2.4).
- FIX: Fixed spurious characters generated by Serial over USB driver (bug