sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm/src/stm32/stm32_adc.c: do not allow negative ref count

Browse Source 
When HAVE_HSI_CONTROL, adc_reset_hsi_disable() calls adc_reset()
followed by adc_shutdown() and this combination is called before
adc_setup() by upper level ADC driver. Without this patch,
priv->initialized wraps from 0 to 255 in this case.

Signed-off-by: Juha Niskanen <juha.niskanen@haltian.com>
This commit is contained in:
Juha Niskanen 2020-11-03 18:40:31 +02:00 committed by Alan Carvalho de Assis
parent 2395258486
commit 1ce75cc7c6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/src/stm32/stm32_adc.c
View File

@ -2792,7 +2792,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
if (priv->initialized > 0)
{
return;
goto out;
}
#ifdef HAVE_HSI_CONTROL
@ -2814,7 +2814,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
#ifdef HAVE_ADC_CMN_DATA
if (adccmn_lock(priv, true) < 0)
{
return;
goto out;
}
if (priv->cmn->initialized == 0)
@ -2833,6 +2833,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
adccmn_lock(priv, false);
#endif
out:
leave_critical_section(flags);
}
@ -2982,9 +2983,14 @@ static void adc_shutdown(FAR struct adc_dev_s *dev)
{
FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
/* Shutdown the ADC device only when not in use */
/* Decrement count only when ADC device is in use */
priv->initialized -= 1;
if (priv->initialized > 0)
{
priv->initialized -= 1;
}
/* Shutdown the ADC device only when not in use */
if (priv->initialized > 0)
{