Merge "i2c: i2c-msm-geni: add rtl based changes" (86029e5e) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/i2c/busses/i2c-msm-geni.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -991,10 +991,13 @@ static int geni_i2c_gsi_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
		if ((geni_ios & 0x3) != 0x3) { //SCL:b'1, SDA:b'0
		GENI_SE_DBG(gi2c->ipcl, true, gi2c->dev,
		"%s: IO lines not in good state\n", __func__);
		/* doing pending cancel only rtl based SE's */
		if (gi2c->is_i2c_rtl_based) {
		gi2c->prev_cancel_pending = true;
		goto geni_i2c_gsi_cancel_pending;
		}
		}
		}
		geni_i2c_err_prep_sg:
		if (gi2c->err) {
		if (!gi2c->is_le_vm) {
		@@ -1200,10 +1203,13 @@ static int geni_i2c_xfer(struct i2c_adapter *adap,
		if ((geni_ios & 0x3) != 0x3) { //SCL:b'1, SDA:b'0
		GENI_SE_DBG(gi2c->ipcl, true, gi2c->dev,
		"%s: IO lines not in good state\n", __func__);
		/* doing pending cancel only rtl based SE's */
		if (gi2c->is_i2c_rtl_based) {
		gi2c->prev_cancel_pending = true;
		goto geni_i2c_txn_ret;
		}
		}
		}

		if (gi2c->err) {
		reinit_completion(&gi2c->xfer);