projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
i2c
/
busses
/
i2c-st.c
diff --git
a/drivers/i2c/busses/i2c-st.c
b/drivers/i2c/busses/i2c-st.c
index fa57c5e57efa9983d097d0ce2937d8b8d5b3f459..9cf715d695515e61fde96d27afe4c650f55c4095 100644
(file)
--- a/
drivers/i2c/busses/i2c-st.c
+++ b/
drivers/i2c/busses/i2c-st.c
@@
-615,7
+615,7
@@
static int st_i2c_xfer_msg(struct st_i2c_dev *i2c_dev, struct i2c_msg *msg,
c->result = 0;
c->stop = is_last;
-
INIT_COMPLETION(
i2c_dev->complete);
+
reinit_completion(&
i2c_dev->complete);
ctl = SSC_CTL_EN | SSC_CTL_MS | SSC_CTL_EN_RX_FIFO | SSC_CTL_EN_TX_FIFO;
st_i2c_set_bits(i2c_dev->base + SSC_CTL, ctl);