diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-04-16 09:27:46 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-04-16 09:27:46 +0000 |
| commit | aeed6d78c11a287f010a55b58bb640f5b54d6254 (patch) | |
| tree | 8c50e7faadbe383916f3fbacd8e2982a15015f19 | |
| parent | faed89a33d39b13b88fbd3d680173b03055f4b49 (diff) | |
| download | ChibiOS-aeed6d78c11a287f010a55b58bb640f5b54d6254.tar.gz ChibiOS-aeed6d78c11a287f010a55b58bb640f5b54d6254.tar.bz2 ChibiOS-aeed6d78c11a287f010a55b58bb640f5b54d6254.zip | |
Fixed bug 3288149.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2881 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/include/adc.h | 2 | ||||
| -rw-r--r-- | readme.txt | 2 |
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
|