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

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

Merge "power: qpnp-smbcharger: cancel hvdcp detection work before rescheduling it"

parents 09adf159 b2a6700a

drivers/power/qpnp-fg.c

+2 −1
Original line number Diff line number Diff line
@@ -4654,8 +4654,9 @@ wait: 
			goto done;

		}

	} else {

		pr_info("Battery profile not same, clearing cycle counters\n");

		pr_info("Battery profile not same, clearing data\n");

		clear_cycle_counter(chip);

		chip->learning_data.learned_cc_uah = 0;

	}

	if (fg_est_dump)

		dump_sram(&chip->dump_sram);

drivers/power/qpnp-smbcharger.c

+3 −1
Original line number Diff line number Diff line
@@ -4523,9 +4523,11 @@ static void handle_usb_insertion(struct smbchg_chip *chip) 
	schedule_work(&chip->usb_set_online_work);



	if (!chip->hvdcp_not_supported &&

			(usb_supply_type == POWER_SUPPLY_TYPE_USB_DCP))

			(usb_supply_type == POWER_SUPPLY_TYPE_USB_DCP)) {

		cancel_delayed_work_sync(&chip->hvdcp_det_work);

		schedule_delayed_work(&chip->hvdcp_det_work,

					msecs_to_jiffies(HVDCP_NOTIFY_MS));

	}



	if (parallel_psy) {

		rc = power_supply_set_present(parallel_psy, true);