diff --git a/drivers/power/qpnp-charger.c b/drivers/power/qpnp-charger.c
index b1b02ffc18a036e0580755e7afc211bea64fec9f..0b96ca6fe4bc381aa94ab4df9a7704a8bd0fa3f8 100644
--- a/drivers/power/qpnp-charger.c
+++ b/drivers/power/qpnp-charger.c
@@ -5402,19 +5402,16 @@ qpnp_charger_probe(struct spmi_device *spmi)
 	if (chip->dc_chgpth_base)
 		qpnp_chg_dc_dcin_valid_irq_handler(chip->dcin_valid.irq, chip);
 
+	/* Set USB psy online to avoid userspace from shutting down if battery
+	 * capacity is at zero and no chargers online. */
+	if (chip->usb_present)
+		power_supply_set_online(chip->usb_psy, 1);
+
 	qpnp_chg_enable_irq(chip, &chip->chg_gone);
 	qpnp_chg_enable_irq(chip, &chip->usbin_valid);
 	if (chip->dc_chgpth_base)
 		qpnp_chg_enable_irq(chip, &chip->dcin_valid);
 
-	power_supply_set_present(chip->usb_psy,
-			qpnp_chg_is_usb_chg_plugged_in(chip));
-
-	/* Set USB psy online to avoid userspace from shutting down if battery
-	 * capacity is at zero and no chargers online. */
-	if (qpnp_chg_is_usb_chg_plugged_in(chip))
-		power_supply_set_online(chip->usb_psy, 1);
-
 	schedule_delayed_work(&chip->aicl_check_work,
 		msecs_to_jiffies(EOC_CHECK_PERIOD_MS));
 	pr_info("success chg_dis = %d, bpd = %d, usb = %d, dc = %d b_health = %d batt_present = %d\n",