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

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

Merge "leds: qpnp-wled: Disable module permanently when OVP fault persists"

parents c6846de7 703b54eb
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ struct qpnp_wled {
	bool			ovp_irq_disabled;
	bool			auto_calib_enabled;
	bool			auto_calib_done;
	bool			module_dis_perm;
	ktime_t			start_ovp_fault_time;
};

@@ -598,6 +599,9 @@ static int qpnp_wled_module_en(struct qpnp_wled *wled,
{
	int rc;

	if (wled->module_dis_perm)
		return 0;

	rc = qpnp_wled_masked_write_reg(wled,
			QPNP_WLED_MODULE_EN_REG(base_addr),
			QPNP_WLED_MODULE_EN_MASK,
@@ -1215,6 +1219,7 @@ static int wled_auto_calibrate(struct qpnp_wled *wled)

	if (!sink_config) {
		pr_warn("No valid WLED sinks found\n");
		wled->module_dis_perm = true;
		goto failed_calib;
	}