Merge "power: smb-lib: Rerun APSD regardless of charger-type" (eed55169) · Commits · e / devices / android_kernel_sony_msm8998

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -725,7 +725,6 @@ void smblib_suspend_on_debug_battery(struct smb_charger *chg)

		int smblib_rerun_apsd_if_required(struct smb_charger *chg)
		{
		const struct apsd_result *apsd_result;
		union power_supply_propval val;
		int rc;

		@@ -738,12 +737,6 @@ int smblib_rerun_apsd_if_required(struct smb_charger *chg)
		if (!val.intval)
		return 0;

		apsd_result = smblib_get_apsd_result(chg);
		if ((apsd_result->pst != POWER_SUPPLY_TYPE_UNKNOWN)
		&& (apsd_result->pst != POWER_SUPPLY_TYPE_USB))
		/* if type is not usb or unknown no need to rerun apsd */
		return 0;

		/* fetch the DPDM regulator */
		if (!chg->dpdm_reg && of_get_property(chg->dev->of_node,
		"dpdm-supply", NULL)) {