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

Unverified Commit 81ed8845 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 81a812c9

sound/soc/codecs/wm_adsp.c

+2 −2
Original line number Diff line number Diff line
@@ -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);