From 87aa63746260e3e9db2fe6b6d8e97b55bdb63a2b Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Mon, 21 Nov 2016 18:00:02 +0000 Subject: [PATCH] ASoC: wm_adsp: Only write shutdown controls for active firmwares The control list may contain shutdown controls for firmwares that are not currently active, attempting to write this will at best fail. To avoid this issue we skip any control that is not active. Fixes: commit f4f0c4c60c39 ("ASoC: wm_adsp: Signal firmware shutdown through event control") Signed-off-by: Charles Keepax Signed-off-by: Mark Brown --- sound/soc/codecs/wm_adsp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 4fb6e2f035e0..6ccb7313a0f6 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1194,6 +1194,9 @@ static void wm_adsp_signal_event_controls(struct wm_adsp *dsp, if (ctl->type != WMFW_CTL_TYPE_HOSTEVENT) continue; + if (!ctl->enabled) + continue; + ret = wm_coeff_write_acked_control(ctl, event); if (ret) adsp_warn(dsp, -- 2.20.1