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

Commit 35427a7a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: fg-gen4/qg: initialize locale variable before use"

parents ed702f3a 8dade100

drivers/power/supply/qcom/battery.c

+3 −0
Original line number Diff line number Diff line
@@ -1691,6 +1691,9 @@ static void pl_config_init(struct pl_data *chip, int smb_version) 
		break;

	case PMI632_SUBTYPE:

		break;

	case PM7250B_SUBTYPE:

		chip->fcc_step_delay_ms = 100;

		break;

	default:

		break;

	}

drivers/power/supply/qcom/qpnp-fg-gen4.c

+2 −4
Original line number Diff line number Diff line
@@ -5762,7 +5762,7 @@ static int fg_gen4_probe(struct platform_device *pdev) 
{

	struct fg_gen4_chip *chip;

	struct fg_dev *fg;

	struct power_supply_config fg_psy_cfg;

	struct power_supply_config fg_psy_cfg = {};

	int rc, msoc, volt_uv, batt_temp;



	chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
@@ -5899,9 +5899,7 @@ static int fg_gen4_probe(struct platform_device *pdev) 


	/* Register the power supply */

	fg_psy_cfg.drv_data = fg;

	fg_psy_cfg.of_node = NULL;

	fg_psy_cfg.supplied_to = NULL;

	fg_psy_cfg.num_supplicants = 0;

	fg_psy_cfg.of_node = fg->dev->of_node;

	fg->fg_psy = devm_power_supply_register(fg->dev, &fg_psy_desc,

			&fg_psy_cfg);

	if (IS_ERR(fg->fg_psy)) {

drivers/power/supply/qcom/qpnp-qg.c

+2 −4
Original line number Diff line number Diff line
@@ -2348,13 +2348,11 @@ static int qg_notifier_cb(struct notifier_block *nb, 


static int qg_init_psy(struct qpnp_qg *chip)

{

	struct power_supply_config qg_psy_cfg;

	struct power_supply_config qg_psy_cfg = {};

	int rc;



	qg_psy_cfg.drv_data = chip;

	qg_psy_cfg.of_node = NULL;

	qg_psy_cfg.supplied_to = NULL;

	qg_psy_cfg.num_supplicants = 0;

	qg_psy_cfg.of_node = chip->dev->of_node;

	chip->qg_psy = devm_power_supply_register(chip->dev,

				&qg_psy_desc, &qg_psy_cfg);

	if (IS_ERR_OR_NULL(chip->qg_psy)) {