Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee7cb3ac authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: fg/smbcharger: fix usage of un-initialized variable"

parents 09075c98 1df265ec

drivers/power/qpnp-fg.c

+4 −0
Original line number Diff line number Diff line
@@ -2609,6 +2609,10 @@ wait: 
		goto wait;

	} else if (ret <= 0) {

		pr_err("transaction timed out ret=%d\n", ret);

		if (fg_is_batt_id_valid(chip))

			resched_ms = fg_sram_update_period_ms;

		else

			resched_ms = SRAM_PERIOD_NO_ID_UPDATE_MS;

		goto out;

	}

	rc = update_sram_data(chip, &resched_ms);

drivers/power/qpnp-smbcharger.c

+1 −1
Original line number Diff line number Diff line
@@ -7910,7 +7910,7 @@ static int smbchg_probe(struct spmi_device *spmi) 
	int rc;

	struct smbchg_chip *chip;

	struct power_supply *usb_psy, *typec_psy = NULL;

	struct qpnp_vadc_chip *vadc_dev, *vchg_vadc_dev;

	struct qpnp_vadc_chip *vadc_dev = NULL, *vchg_vadc_dev = NULL;

	const char *typec_psy_name;



	usb_psy = power_supply_get_by_name("usb");