Merge "power: smb5-lib: Fix no charging with Type-C legacy cable via PD adaptor" (1c2b0efa) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/power/supply/qcom/smb5-lib.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1267,7 +1267,7 @@ int smblib_set_icl_current(struct smb_charger *chg, int icl_ua)
		if (icl_ua <= USBIN_500MA) {
		rc = set_sdp_current(chg, icl_ua);
		if (rc >= 0)
		goto out;
		goto unsuspend;
		}

		rc = smblib_set_charge_param(chg, &chg->param.usb_icl, icl_ua);
		@@ -1285,6 +1285,7 @@ int smblib_set_icl_current(struct smb_charger *chg, int icl_ua)
		goto out;
		}

		unsuspend:
		/* unsuspend after configuring current and override */
		rc = smblib_set_usb_suspend(chg, false);
		if (rc < 0) {
		@@ -1293,8 +1294,9 @@ int smblib_set_icl_current(struct smb_charger *chg, int icl_ua)
		}

		/* Re-run AICL */
		if (chg->real_charger_type != POWER_SUPPLY_TYPE_USB)
		if (icl_override != SW_OVERRIDE_HC_MODE)
		rc = smblib_rerun_aicl(chg);

		out:
		return rc;
		}