Merge "hwmon: qpnp-adc-voltage: Fix lockup during recurring measurement" (7584e5e2) · Commits · e / devices / android_kernel_sony_msm8994

drivers/hwmon/qpnp-adc-voltage.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1279,7 +1279,6 @@ int32_t qpnp_get_vadc_gain_and_offset(struct qpnp_vadc_chip *vadc,
		rc = qpnp_vadc_is_valid(vadc);
		if (rc < 0)
		return rc;
		mutex_lock(&vadc->adc->adc_lock);

		switch (calib_type) {
		case CALIB_RATIOMETRIC:
		@@ -1304,7 +1303,6 @@ int32_t qpnp_get_vadc_gain_and_offset(struct qpnp_vadc_chip *vadc,
		rc = -EINVAL;
		}

		mutex_unlock(&vadc->adc->adc_lock);
		return rc;
		}
		EXPORT_SYMBOL(qpnp_get_vadc_gain_and_offset);