Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34702908 authored by Alain Volmat's avatar Alain Volmat Committed by Greg Kroah-Hartman
Browse files

i2c: stm32f7: recover the bus on access timeout 



commit b933d1faf8fa30d16171bcff404e39c41b2a7c84 upstream.

When getting an access timeout, ensure that the bus is in a proper
state prior to returning the error.

Fixes: aeb068c5 ("i2c: i2c-stm32f7: add driver")
Signed-off-by: default avatarAlain Volmat <alain.volmat@foss.st.com>
Reviewed-by: default avatarPierre-Yves MORDRET <pierre-yves.mordret@foss.st.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8bf31f9d

drivers/i2c/busses/i2c-stm32f7.c

+2 −0
Original line number Diff line number Diff line
@@ -1579,6 +1579,7 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap, 
			i2c_dev->msg->addr);

		if (i2c_dev->use_dma)

			dmaengine_terminate_all(dma->chan_using);

		stm32f7_i2c_wait_free_bus(i2c_dev);

		ret = -ETIMEDOUT;

	}
@@ -1629,6 +1630,7 @@ static int stm32f7_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, 
		dev_dbg(dev, "Access to slave 0x%x timed out\n", f7_msg->addr);

		if (i2c_dev->use_dma)

			dmaengine_terminate_all(dma->chan_using);

		stm32f7_i2c_wait_free_bus(i2c_dev);

		ret = -ETIMEDOUT;

		goto clk_free;

	}