A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

ASoC: wm_adsp: Switch to listing firmwares per core

Browse source 
Change-Id: I3ce2687dec8159012dcacc38b5867fdcc9a24679
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Mot-CRs-fixed: (CR)
Reviewed-on: https://gerrit.mot.com/1177443
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Rav(CR) Vembu <raviv@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Charles Keepax 2016-06-06 17:28:15 +01:00 • committed by Ravikumar Vembu
commit ee2bf724f7
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/codecs/wm_adsp.c
View file

@ -3762,7 +3762,7 @@ int wm_halo_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
if (ret != 0)
goto err;
if (wm_adsp_fw[dsp->fw].num_caps != 0) {
if (dsp->firmwares[dsp->fw].num_caps != 0) {
ret = wm_adsp_buffer_init(dsp);
if (ret < 0)
goto err;
@ -3789,7 +3789,7 @@ int wm_halo_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,
wm_halo_clear_stream_arb(dsp);
if (wm_adsp_fw[dsp->fw].num_caps != 0)
if (dsp->firmwares[dsp->fw].num_caps != 0)
wm_adsp_buffer_free(dsp);
mutex_unlock(&dsp->pwr_lock);
@ -4516,7 +4516,7 @@ static int wm_adsp_buffer_init(struct wm_adsp *dsp)
goto err_buffer2;
}
buf->regions = kcalloc(wm_adsp_fw[dsp->fw].caps->num_regions,
buf->regions = kcalloc(dsp->firmwares[dsp->fw].caps->num_regions,
sizeof(*buf->regions), GFP_KERNEL);
if (!buf->regions) {
ret = -ENOMEM;
@ -4723,7 +4723,7 @@ int wm_adsp_compr_handle_irq(struct wm_adsp *dsp, int channel)
goto out;
}
if (wm_adsp_fw[dsp->fw].voice_trigger && buf->irq_count == 2)
if (dsp->firmwares[dsp->fw].voice_trigger && buf->irq_count == 2)
ret = WM_ADSP_COMPR_VOICE_TRIGGER;
out_notify: