Merge "thermal: qpnp-adc-tm: Keep VADC_TM peripheral always enabled" (04bbd7d1) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/thermal/qpnp-adc-tm.c

+3 −9

Original line number	Diff line number	Diff line
		@@ -469,19 +469,13 @@ static int32_t qpnp_adc_tm_disable(struct qpnp_adc_tm_chip *chip)
		u8 data = 0;
		int rc = 0;

		if (chip->adc_tm_hc) {
		rc = qpnp_adc_tm_write_reg(chip, QPNP_BTM_CONV_REQ, data, 1);
		if (rc < 0) {
		pr_err("adc-tm enable failed\n");
		return rc;
		}
		}

		if (!chip->adc_tm_hc) {
		rc = qpnp_adc_tm_write_reg(chip, QPNP_EN_CTL1, data, 1);
		if (rc < 0) {
		pr_err("adc-tm disable failed\n");
		return rc;
		}
		}

		return rc;
		}