i2c: stm32f7: recover the bus on access timeout
When getting an access timeout, ensure that the bus is in a proper state prior to returning the error. Fixes: aeb068c57214 ("i2c: i2c-stm32f7: add driver") Signed-off-by: Alain Volmat <alain.volmat@foss.st.com> Reviewed-by: Pierre-Yves MORDRET <pierre-yves.mordret@foss.st.com> Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
parent
0c21d02ca4
commit
b933d1faf8
@ -1712,6 +1712,7 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap,
|
|||||||
i2c_dev->msg->addr);
|
i2c_dev->msg->addr);
|
||||||
if (i2c_dev->use_dma)
|
if (i2c_dev->use_dma)
|
||||||
dmaengine_terminate_all(dma->chan_using);
|
dmaengine_terminate_all(dma->chan_using);
|
||||||
|
stm32f7_i2c_wait_free_bus(i2c_dev);
|
||||||
ret = -ETIMEDOUT;
|
ret = -ETIMEDOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1769,6 +1770,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);
|
dev_dbg(dev, "Access to slave 0x%x timed out\n", f7_msg->addr);
|
||||||
if (i2c_dev->use_dma)
|
if (i2c_dev->use_dma)
|
||||||
dmaengine_terminate_all(dma->chan_using);
|
dmaengine_terminate_all(dma->chan_using);
|
||||||
|
stm32f7_i2c_wait_free_bus(i2c_dev);
|
||||||
ret = -ETIMEDOUT;
|
ret = -ETIMEDOUT;
|
||||||
goto pm_free;
|
goto pm_free;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user