diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2023-06-16 09:28:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2023-06-16 09:28:27 +0200 |
| commit | 227d2c3154a93f424503d3e4b7e157288848cf1b (patch) | |
| tree | 60eba99180018c3206f358a0f0bf18b004cf670f /drivers/firmware | |
| parent | ALSA: usb-audio: Add quirk flag for HEM devices to enable native DSD playback (diff) | |
| parent | ASoC: tegra: Fix Master Volume Control (diff) | |
| download | linux-227d2c3154a93f424503d3e4b7e157288848cf1b.tar.gz linux-227d2c3154a93f424503d3e4b7e157288848cf1b.tar.bz2 linux-227d2c3154a93f424503d3e4b7e157288848cf1b.zip | |
Merge tag 'asoc-fix-v6.4-rc6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.4
A couple more fixes for v6.4, one fixing a misleading error log and
another stopping us seeing spurious failures setting the master volume
on some Tegra systems introduced by a change to how we calculate delay
times.
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/cirrus/cs_dsp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c index e4ccfb6a8fa5..ec056f6f40ce 100644 --- a/drivers/firmware/cirrus/cs_dsp.c +++ b/drivers/firmware/cirrus/cs_dsp.c @@ -2124,6 +2124,7 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware file, blocks, le32_to_cpu(blk->len), type, le32_to_cpu(blk->id)); + region_name = cs_dsp_mem_region_name(type); mem = cs_dsp_find_region(dsp, type); if (!mem) { cs_dsp_err(dsp, "No base for region %x\n", type); @@ -2147,8 +2148,8 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware reg = dsp->ops->region_to_reg(mem, reg); reg += offset; } else { - cs_dsp_err(dsp, "No %x for algorithm %x\n", - type, le32_to_cpu(blk->id)); + cs_dsp_err(dsp, "No %s for algorithm %x\n", + region_name, le32_to_cpu(blk->id)); } break; |