Merge "power: battery: Fix SMB1355 Parallel Charging disabling issue" (839d54d2) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/power/supply/qcom/battery.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1263,6 +1263,8 @@ static bool is_parallel_available(struct pl_data *chip)
		if (!chip->pl_psy)
		return false;

		vote(chip->pl_disable_votable, PARALLEL_PSY_VOTER, false, 0);

		rc = power_supply_get_property(chip->pl_psy,
		POWER_SUPPLY_PROP_PARALLEL_MODE, &pval);
		if (rc < 0) {
		@@ -1311,8 +1313,6 @@ static bool is_parallel_available(struct pl_data *chip)
		if (!rc)
		chip->pl_fcc_max = pval.intval;

		vote(chip->pl_disable_votable, PARALLEL_PSY_VOTER, false, 0);

		return true;
		}