diff options
| author | Tai Kuo <taikuo@google.com> | 2021-04-13 16:08:16 +0800 |
|---|---|---|
| committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-19 13:30:06 +0000 |
| commit | ba22cd0fd14814528519f2e909319ce843791827 (patch) | |
| tree | 4c943aa144a35591025f6bdf9e8ca6ef69e8305c /cs40l26 | |
| parent | b8e1f704583793bcc507616f50e4dc57ccda42df (diff) | |
| download | amplifiers-ba22cd0fd14814528519f2e909319ce843791827.tar.gz | |
cs40l26: fix BB of "Add Open Wavetable Support"
40ae66e93fd1 input: cs40l26: Add Open Wavetable Support
5ebd6b1cdf42 firmware: cirrus: Add Open Wavetable Support
Bug: 184610991
Test: Built pass.
Signed-off-by: Tai Kuo <taikuo@google.com>
Change-Id: Ibd00518f1c92050dca792b9d6f9fc48aa9fb2b13
Diffstat (limited to 'cs40l26')
| -rw-r--r-- | cs40l26/cl_dsp.c | 2 | ||||
| -rw-r--r-- | cs40l26/cl_dsp.h | 4 | ||||
| -rw-r--r-- | cs40l26/cs40l26.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cs40l26/cl_dsp.c b/cs40l26/cl_dsp.c index 3efac31..47b2008 100644 --- a/cs40l26/cl_dsp.c +++ b/cs40l26/cl_dsp.c @@ -230,7 +230,7 @@ static int cl_dsp_read_wt(struct cl_dsp *dsp, int pos, int size) if (entry->type == WT_TYPE_TERMINATOR) { dsp->wt_desc->owt.nwaves = i; - dsp->wt_desc->owt.bytes = max(ch.bytes, + dsp->wt_desc->owt.bytes = max((long)ch.bytes, (void *)max - buf); return dsp->wt_desc->owt.bytes; diff --git a/cs40l26/cl_dsp.h b/cs40l26/cl_dsp.h index 2cc1578..fbaf62e 100644 --- a/cs40l26/cl_dsp.h +++ b/cs40l26/cl_dsp.h @@ -251,7 +251,7 @@ struct cl_dsp_coeff_desc { struct cl_dsp_memchunk { u8 *data; u8 *max; - int bytes; + u32 bytes; u32 cache; int cachebits; }; @@ -267,7 +267,7 @@ struct cl_dsp_owt_header { struct cl_dsp_owt_desc { struct cl_dsp_owt_header waves[CL_DSP_OWT_HEADER_MAX_LEN]; int nwaves; - int bytes; + u32 bytes; u8 raw_data[CL_DSP_MAX_BIN_SIZE]; }; diff --git a/cs40l26/cs40l26.c b/cs40l26/cs40l26.c index 62b03f1..591af67 100644 --- a/cs40l26/cs40l26.c +++ b/cs40l26/cs40l26.c @@ -1654,7 +1654,7 @@ static void cs40l26_vibe_start_worker(struct work_struct *work) struct device *dev = cs40l26->dev; int ret = 0; unsigned int reg, freq; - u32 index, algo_id; + u32 index = 0, algo_id; u16 duration; pm_runtime_get_sync(dev); @@ -1951,7 +1951,7 @@ static int cs40l26_owt_upload(struct cs40l26_private *cs40l26, s16 *data, unsigned int write_reg, reg, wt_offset, wt_size, wt_base; struct cl_dsp_memchunk header_ch, data_ch; u8 *full_data, *header; - int ret = 0, i; + int ret = 0; data_ch = cl_dsp_memchunk_create((void *) data, data_size_bytes); |