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

This commit is contained in:
Linux Build Service Account 2017-11-05 22:32:43 -08:00 committed by Gerrit - the friendly Code Review server
commit 67dcc348d7

View file

@ -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;
}