diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-31 18:23:43 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-31 18:23:43 +0300 |
| commit | 4c11d7675827421194325b82b20ddc6c8b86c83d (patch) | |
| tree | 1c1ebd688bf501636bab4068f0dd30cc460ef8d5 /sound/soc/codecs/tas6424.c | |
| parent | 919869214b8e0b24926a278e121879f60df485bb (diff) | |
| parent | d40e3e9e44db4b3c8777f3b515ba6097ba26e3b2 (diff) | |
| download | linux-4c11d7675827421194325b82b20ddc6c8b86c83d.tar.xz | |
Merge branch 'asoc-4.19' into asoc-4.20 tas dependency
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 3315ce8a15e6..aac559fffc1a 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"); |