Merge "battery: don't wait for aicl rerun" (103e31fe) · Commits · e / devices / android_kernel_sony_msm8998

drivers/power/supply/qcom/battery.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -551,7 +551,7 @@ static int usb_icl_vote_callback(struct votable votable, void data,
		POWER_SUPPLY_PROP_CURRENT_MAX,
		&pval);
		/* wait for ICL change */
		msleep(100);
		msleep(20);
		}

		/* set the effective ICL */
		@@ -559,9 +559,6 @@ static int usb_icl_vote_callback(struct votable votable, void data,
		power_supply_set_property(chip->main_psy,
		POWER_SUPPLY_PROP_CURRENT_MAX,
		&pval);
		if (rerun_aicl)
		/* wait for ICL change */
		msleep(100);

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