diff --git a/drivers/power/supply/qcom/battery.c b/drivers/power/supply/qcom/battery.c
index 5f1b6b294b5f..6f9fc667bc0e 100644
--- a/drivers/power/supply/qcom/battery.c
+++ b/drivers/power/supply/qcom/battery.c
@@ -82,7 +82,7 @@ enum {
 static void split_settled(struct pl_data *chip)
 {
 	int slave_icl_pct;
-	int slave_ua;
+	int slave_ua = 0;
 	union power_supply_propval pval = {0, };
 	int rc;
 
@@ -94,11 +94,9 @@ static void split_settled(struct pl_data *chip)
 	if (chip->pl_mode != POWER_SUPPLY_PARALLEL_USBIN_USBIN)
 		return;
 
-	if (chip->main_psy)
+	if (!chip->main_psy)
 		return;
 
-	slave_ua = 0;
-
 	if (!get_effective_result_locked(chip->pl_disable_votable)) {
 		/* read the aicl settled value */
 		rc = power_supply_get_property(chip->main_psy,
@@ -375,15 +373,17 @@ static int pl_disable_vote_callback(struct votable *votable,
 	if (!pl_disable) { /* enable */
 		rerun_election(chip->fv_votable);
 		rerun_election(chip->fcc_votable);
-
-		if (chip->pl_psy) {
-			pval.intval = 0;
-			rc = power_supply_set_property(chip->pl_psy,
-					POWER_SUPPLY_PROP_INPUT_SUSPEND, &pval);
-			if (rc < 0)
-				pr_err("Couldn't change slave suspend state rc=%d\n",
-					rc);
-		}
+		/*
+		 * Enable will be called with a valid pl_psy always. The
+		 * PARALLEL_PSY_VOTER keeps it disabled unless a pl_psy
+		 * is seen.
+		 */
+		pval.intval = 0;
+		rc = power_supply_set_property(chip->pl_psy,
+				POWER_SUPPLY_PROP_INPUT_SUSPEND, &pval);
+		if (rc < 0)
+			pr_err("Couldn't change slave suspend state rc=%d\n",
+				rc);
 
 		if (chip->pl_mode == POWER_SUPPLY_PARALLEL_USBIN_USBIN)
 			split_settled(chip);
@@ -406,6 +406,7 @@ static int pl_disable_vote_callback(struct votable *votable,
 		if (chip->pl_mode == POWER_SUPPLY_PARALLEL_USBIN_USBIN)
 			split_settled(chip);
 
+		/* pl_psy may be NULL while in the disable branch */
 		if (chip->pl_psy) {
 			pval.intval = 1;
 			rc = power_supply_set_property(chip->pl_psy,
diff --git a/drivers/power/supply/qcom/smb-lib.c b/drivers/power/supply/qcom/smb-lib.c
index 5faa05c1c270..ee87b312963f 100644
--- a/drivers/power/supply/qcom/smb-lib.c
+++ b/drivers/power/supply/qcom/smb-lib.c
@@ -505,7 +505,7 @@ static int smblib_notifier_call(struct notifier_block *nb,
 			schedule_work(&chg->bms_update_work);
 	}
 
-	if (!chg->pl.psy && !strcmp(psy->desc->name, "usb-parallel"))
+	if (!chg->pl.psy && !strcmp(psy->desc->name, "parallel"))
 		chg->pl.psy = psy;
 
 	return NOTIFY_OK;
@@ -3538,8 +3538,7 @@ int smblib_init(struct smb_charger *chg)
 		}
 
 		chg->bms_psy = power_supply_get_by_name("bms");
-		chg->pl.psy = power_supply_get_by_name("usb-parallel");
-
+		chg->pl.psy = power_supply_get_by_name("parallel");
 		break;
 	case PARALLEL_SLAVE:
 		break;