diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2019-05-01 11:13:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-02 11:10:35 +0900 |
| commit | 81ed884501a59a49c71cd810578f793f3890c131 (patch) | |
| tree | 2b75291690ace187c9ae85eac7227be02115b199 /sound/soc/codecs/wm_adsp.c | |
| parent | 81a812c98b6eda7e3101305d57354433e3edc541 (diff) | |
| download | linux-81ed884501a59a49c71cd810578f793f3890c131.tar.bz2 | |
ASoC: wm_adsp: Use DSP ops pointers to stop watchdog in error handlers
Whilst this isn't strictly necessary as the code is already DSP specific
better to use the pointers to avoid potential issues in the future if
one core ends up having multiple methods of stopping the watchdog.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm_adsp.c')
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index a9298bfddd9c..bb10c4aeceb4 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -4285,7 +4285,7 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) if (val & ADSP2_WDT_TIMEOUT_STS_MASK) { adsp_err(dsp, "watchdog timeout error\n"); - wm_adsp_stop_watchdog(dsp); + dsp->ops->stop_watchdog(dsp); wm_adsp_fatal_error(dsp); } @@ -4396,7 +4396,7 @@ irqreturn_t wm_halo_wdt_expire(int irq, void *data) mutex_lock(&dsp->pwr_lock); adsp_warn(dsp, "WDT Expiry Fault\n"); - wm_halo_stop_watchdog(dsp); + dsp->ops->stop_watchdog(dsp); wm_adsp_fatal_error(dsp); mutex_unlock(&dsp->pwr_lock); |