diff options
| author | Andrew F. Davis <afd@ti.com> | 2018-08-31 10:14:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-31 16:23:25 +0100 |
| commit | d40e3e9e44db4b3c8777f3b515ba6097ba26e3b2 (patch) | |
| tree | 3d23248a0db2eb3d0e48d9b34799b50d1eb30dca /sound/soc/codecs/tas6424.c | |
| parent | 5ea752c6efdf5aa8a57aed816d453a8f479f1b0a (diff) | |
| download | lwn-d40e3e9e44db4b3c8777f3b515ba6097ba26e3b2.tar.gz lwn-d40e3e9e44db4b3c8777f3b515ba6097ba26e3b2.zip | |
ASoC: tas6424: Save last fault register even when clear
When there is no fault bit set in a fault register we skip the fault
reporting section for that register. This also skips over saving that
registers value. We save the value so we will not double report an
error, but if an error clears then returns we will also not report it
as we did not save the all cleared register value. Fix this by saving
the fault register value in the all clear path.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'sound/soc/codecs/tas6424.c')
| -rw-r--r-- | sound/soc/codecs/tas6424.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/soc/codecs/tas6424.c b/sound/soc/codecs/tas6424.c index 14999b999fd3..0d6145549a98 100644 --- a/sound/soc/codecs/tas6424.c +++ b/sound/soc/codecs/tas6424.c @@ -424,8 +424,10 @@ static void tas6424_fault_check_work(struct work_struct *work) TAS6424_FAULT_PVDD_UV | TAS6424_FAULT_VBAT_UV; - if (reg) + if (!reg) { + tas6424->last_fault1 = reg; goto check_global_fault2_reg; + } /* * Only flag errors once for a given occurrence. This is needed as @@ -461,8 +463,10 @@ check_global_fault2_reg: TAS6424_FAULT_OTSD_CH3 | TAS6424_FAULT_OTSD_CH4; - if (!reg) + if (!reg) { + tas6424->last_fault2 = reg; goto check_warn_reg; + } if ((reg & TAS6424_FAULT_OTSD) && !(tas6424->last_fault2 & TAS6424_FAULT_OTSD)) dev_crit(dev, "experienced a global overtemp shutdown\n"); @@ -497,8 +501,10 @@ check_warn_reg: TAS6424_WARN_VDD_OTW_CH3 | TAS6424_WARN_VDD_OTW_CH4; - if (!reg) + if (!reg) { + tas6424->last_warn = reg; goto out; + } if ((reg & TAS6424_WARN_VDD_UV) && !(tas6424->last_warn & TAS6424_WARN_VDD_UV)) dev_warn(dev, "experienced a VDD under voltage condition\n"); |