diff --git a/ChangeLog b/ChangeLog index ae94aa4b84..e6dc2994f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5414,4 +5414,7 @@ * arch/arm/src/sama5/sam_ohci.c: More to be tested, but the SAMA5 OHCI driver is now basically funtional (2013-8-16). * include/nuttx/usb/ehci.h: EHCI header file (2013-8-17). + * arch/arm/src/stm32/stm32_i2c.c: Correct an error that crept into + the STM32 F1 I2C driver with some recent changes. From Yiran Liao + (2013-8-18). diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c index c14f3e30ea..3c5014d6a8 100644 --- a/arch/arm/src/stm32/stm32_i2c.c +++ b/arch/arm/src/stm32/stm32_i2c.c @@ -1355,7 +1355,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv) * since ACK is not returned. We should ignore this error. */ - if ((status & I2C_ISR_ERRORMASK) != 0) + if ((status & I2C_SR1_ERRORMASK) != 0) { stm32_i2c_traceevent(priv, I2CEVENT_ERROR, 0);