diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-14 15:17:28 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-14 15:17:28 +0200 |
| commit | 7a7a07ed0ec492b3ab9f87467189886a66b2fc1a (patch) | |
| tree | 9f009790b1edef505f6e36ce1c7af886824790f6 | |
| parent | 26ce0879670c1e2536b46ea6c8e14ca8b7b7fd88 (diff) | |
| download | px4-nuttx-7a7a07ed0ec492b3ab9f87467189886a66b2fc1a.tar.gz px4-nuttx-7a7a07ed0ec492b3ab9f87467189886a66b2fc1a.tar.bz2 px4-nuttx-7a7a07ed0ec492b3ab9f87467189886a66b2fc1a.zip | |
Revert "stm32_i2c: ensure that unexpected ISR can't overwrite stale data"
This reverts commit 099b2017ccfa0fc7696f168db2a0c2e13fe5edbc.
This is only a temporary measure to gain the time to apply a more complete fix without side effects.
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_i2c.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_i2c.c b/nuttx/arch/arm/src/stm32/stm32_i2c.c index 996e8af39..c02bf4543 100644 --- a/nuttx/arch/arm/src/stm32/stm32_i2c.c +++ b/nuttx/arch/arm/src/stm32/stm32_i2c.c @@ -1600,12 +1600,7 @@ static int stm32_i2c_process(FAR struct i2c_dev_s *dev, FAR struct i2c_msg_s *ms stm32_i2c_clrstart(priv); /* Old transfers are done */ - - /* reset ptr and dcnt to ensure an unexpected data - interrupt doesn't overwrite stale data */ - priv->dcnt = 0; - priv->ptr = NULL; - + priv->msgv = msgs; priv->msgc = count; @@ -1756,10 +1751,6 @@ static int stm32_i2c_process(FAR struct i2c_dev_s *dev, FAR struct i2c_msg_s *ms stm32_i2c_enablefsmc(ahbenr); stm32_i2c_sem_post(dev); - - /* ensure that any ISR happening after we finish can't overwrite any user data */ - priv->dcnt = 0; - priv->ptr = NULL; return -errval; } |