Hello patrice,
Am 11.10.2017 um 15:30 schrieb patrice.chotard@st.com:
From: Christophe Kerello christophe.kerello@st.com
As "v" is a local variable in stm32_i2c_choose_solution() "v" has to be copied into "s" to avoid data abort in stm32_i2c_compute_timing().
Signed-off-by: Christophe Kerello christophe.kerello@st.com Reviewed-by: Patrick DELAUNAY patrick.delaunay@st.com Signed-off-by: Patrice Chotard patrice.chotard@st.com
drivers/i2c/stm32f7_i2c.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
Your patch does not apply to u-boot mainline:
hs@pollux [ 4:41:31] ttbott> git am -3 mbox Applying: i2c: stm32f7_i2c: fix data abort Using index info to reconstruct a base tree... M drivers/i2c/stm32f7_i2c.c Falling back to patching base and 3-way merge... Auto-merging drivers/i2c/stm32f7_i2c.c CONFLICT (content): Merge conflict in drivers/i2c/stm32f7_i2c.c error: Failed to merge in the changes. Patch failed at 0001 i2c: stm32f7_i2c: fix data abort The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". hs@pollux [ 4:41:31] ttbott>
For full log see for example on the corvus board:
http://xeidos.ddns.net/tbot/id_469/html_log.html
unfold the last three 4 "control" lines ...
please fix, thanks!
bye, Heiko