Skip to content

Commit

Permalink
ASoC: wm_adsp: Fixup wm_adsp2_boot_work error paths
Browse files Browse the repository at this point in the history
Currently we are not disabling MEM_ENA on the error path, we should
really do this to unwind the state back to how it was. This patch adds a
clear of MEM_ENA on the error path, again there is no major issues
caused by this minor fix.

Signed-off-by: Charles Keepax <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
charleskeepax authored and broonie committed Jan 24, 2017
1 parent e779974 commit d589d8b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion sound/soc/codecs/wm_adsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2450,7 +2450,7 @@ static void wm_adsp2_boot_work(struct work_struct *work)

ret = wm_adsp2_ena(dsp);
if (ret != 0)
goto err_mutex;
goto err_mem;

ret = wm_adsp_load(dsp);
if (ret != 0)
Expand Down Expand Up @@ -2484,6 +2484,9 @@ static void wm_adsp2_boot_work(struct work_struct *work)
err_ena:
regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0);
err_mem:
regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
ADSP2_MEM_ENA, 0);
err_mutex:
mutex_unlock(&dsp->pwr_lock);
}
Expand Down

0 comments on commit d589d8b

Please sign in to comment.