Commit e81c979f authored by Russell King's avatar Russell King Committed by Wolfram Sang
Browse files

i2c: pxa: clear all master action bits in i2c_pxa_stop_message() 



If we timeout during a message transfer, the control register may
contain bits that cause an action to be set. Read-modify-writing the
register leaving these bits set may trigger the hardware to attempt
one of these actions unintentionally.

Always clear these bits when cleaning up after a message or after
a timeout.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 18d30c09

drivers/i2c/busses/i2c-pxa.c

+2 −4
Original line number Diff line number Diff line
@@ -795,11 +795,9 @@ static inline void i2c_pxa_stop_message(struct pxa_i2c *i2c) 
{

	u32 icr;



	/*

	 * Clear the STOP and ACK flags

	 */

	/* Clear the START, STOP, ACK, TB and MA flags */

	icr = readl(_ICR(i2c));

	icr &= ~(ICR_STOP | ICR_ACKNAK);

	icr &= ~(ICR_START | ICR_STOP | ICR_ACKNAK | ICR_TB | ICR_MA);

	writel(icr, _ICR(i2c));

}