Commit 227d2c31 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.4-rc6-2' of... 

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.
parents 122e2cb7 f9fd804a

drivers/firmware/cirrus/cs_dsp.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

sound/soc/tegra/tegra_pcm.c

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ int tegra_pcm_open(struct snd_soc_component *component, 
		return ret;

	}



	/* Set wait time to 500ms by default */

	substream->wait_time = 500;



	return 0;

}

EXPORT_SYMBOL_GPL(tegra_pcm_open);