diff options
author | Mark Brown <broonie@kernel.org> | 2020-10-09 15:42:31 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-10-09 15:42:31 +0100 |
commit | c890e30b069a2792a5a34e8510a7a437dd6f5b3d (patch) | |
tree | f7fc7cb5e6fddbe4cae599b41bb39ebc349b94cd /sound/soc/codecs/wm_adsp.c | |
parent | 7ffe09eebf732f9c95623613fb706dada858c07d (diff) | |
parent | 86f29c7442ac4ba5fe19fc2ada457f76c0080dd6 (diff) | |
download | linux-c890e30b069a2792a5a34e8510a7a437dd6f5b3d.tar.gz linux-c890e30b069a2792a5a34e8510a7a437dd6f5b3d.tar.bz2 linux-c890e30b069a2792a5a34e8510a7a437dd6f5b3d.zip |
Merge remote-tracking branch 'asoc/for-5.10' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm_adsp.c')
-rw-r--r-- | sound/soc/codecs/wm_adsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 344bd2c33bea..bcf18bf15a02 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -199,7 +199,7 @@ #define ADSP2_PMEM_ERR_ADDR_XMEM_ERR_ADDR 0x7C #define ADSP2_REGION_LOCK_ERR_MASK 0x8000 -#define ADSP2_SLAVE_ERR_MASK 0x4000 +#define ADSP2_ADDR_ERR_MASK 0x4000 #define ADSP2_WDT_TIMEOUT_STS_MASK 0x2000 #define ADSP2_CTRL_ERR_PAUSE_ENA 0x0002 #define ADSP2_CTRL_ERR_EINT 0x0001 @@ -4382,9 +4382,9 @@ irqreturn_t wm_adsp2_bus_error(int irq, void *data) wm_adsp_fatal_error(dsp); } - if (val & (ADSP2_SLAVE_ERR_MASK | ADSP2_REGION_LOCK_ERR_MASK)) { - if (val & ADSP2_SLAVE_ERR_MASK) - adsp_err(dsp, "bus error: slave error\n"); + if (val & (ADSP2_ADDR_ERR_MASK | ADSP2_REGION_LOCK_ERR_MASK)) { + if (val & ADSP2_ADDR_ERR_MASK) + adsp_err(dsp, "bus error: address error\n"); else adsp_err(dsp, "bus error: region lock error\n"); |