| commit | 2f0b605d0c8d7d726f2cf3fc658f7216fc799e6e | [log] [tgz] |
|---|---|---|
| author | Kyle Yan <kyan@quicinc.com> | Fri Mar 31 04:00:15 2017 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Fri Mar 31 04:00:15 2017 -0700 |
| tree | 90d3e8a1a64496fa6966dcf30b37f84350b72db7 | |
| parent | bd2fcf402fc7dc008dbd51b9f7d1563a95d2d859 [diff] | |
| parent | d5890b2a07ab0dd465d2c5bd48807d4b955efe52 [diff] |
Merge "i2c: qcom: geni: Fix the way stretch stop is done" into msm-4.9
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index d7b4363..58e8850 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c
@@ -173,7 +173,7 @@ u32 m_param = 0; u32 m_cmd = 0; - m_param |= (stretch ? STOP_STRETCH : ~(STOP_STRETCH)); + m_param |= (stretch ? STOP_STRETCH : 0); m_param |= ((msgs[i].addr & 0x7F) << SLV_ADDR_SHFT); gi2c->cur = &msgs[i];