Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a5cf9e8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.0-rc5' of... 

Merge tag 'asoc-fix-v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.0

A selection of driver specific fixes here, along with a few core fixes:

 - A fixup for some MFD devices that were broken by the previous fixes
   for deferred probe.
 - A fix for potential out of bounds array accesses when ordering DAPM
   power/up down sequences.
 - Avoid use after free issue when unloading and reloading drivers using
   topologies.
parents 2bc16b9f 860b454c

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -6143,7 +6143,7 @@ FREESCALE SOC SOUND DRIVERS 
M:	Timur Tabi <timur@kernel.org>

M:	Nicolin Chen <nicoleotsuka@gmail.com>

M:	Xiubo Li <Xiubo.Lee@gmail.com>

R:	Fabio Estevam <fabio.estevam@nxp.com>

R:	Fabio Estevam <festevam@gmail.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	linuxppc-dev@lists.ozlabs.org

S:	Maintained
@@ -10889,7 +10889,7 @@ F: include/linux/nvmem-consumer.h 
F:	include/linux/nvmem-provider.h



NXP SGTL5000 DRIVER

M:	Fabio Estevam <fabio.estevam@nxp.com>

M:	Fabio Estevam <festevam@gmail.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/sound/sgtl5000.txt

sound/soc/codecs/hdmi-codec.c

+2 −2
Original line number Diff line number Diff line
@@ -795,6 +795,8 @@ static int hdmi_codec_probe(struct platform_device *pdev) 
	if (hcd->spdif)

		hcp->daidrv[i] = hdmi_spdif_dai;



	dev_set_drvdata(dev, hcp);



	ret = devm_snd_soc_register_component(dev, &hdmi_driver, hcp->daidrv,

				     dai_count);

	if (ret) {
@@ -802,8 +804,6 @@ static int hdmi_codec_probe(struct platform_device *pdev) 
			__func__, ret);

		return ret;

	}



	dev_set_drvdata(dev, hcp);

	return 0;

}

sound/soc/codecs/rt5682.c

+2 −0
Original line number Diff line number Diff line
@@ -1778,7 +1778,9 @@ static const struct snd_soc_dapm_route rt5682_dapm_routes[] = { 
	{"ADC Stereo1 Filter", NULL, "ADC STO1 ASRC", is_using_asrc},

	{"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc},

	{"ADC STO1 ASRC", NULL, "AD ASRC"},

	{"ADC STO1 ASRC", NULL, "DA ASRC"},

	{"ADC STO1 ASRC", NULL, "CLKDET"},

	{"DAC STO1 ASRC", NULL, "AD ASRC"},

	{"DAC STO1 ASRC", NULL, "DA ASRC"},

	{"DAC STO1 ASRC", NULL, "CLKDET"},

sound/soc/samsung/i2s.c

+5 −5
Original line number Diff line number Diff line
@@ -700,6 +700,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, 
{

	struct i2s_dai *i2s = to_info(dai);

	u32 mod, mask = 0, val = 0;

	struct clk *rclksrc;

	unsigned long flags;



	WARN_ON(!pm_runtime_active(dai->dev));
@@ -782,6 +783,10 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, 


	i2s->frmclk = params_rate(params);



	rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC];

	if (rclksrc && !IS_ERR(rclksrc))

		i2s->rclk_srcrate = clk_get_rate(rclksrc);



	return 0;

}
@@ -886,11 +891,6 @@ static int config_setup(struct i2s_dai *i2s) 
		return 0;



	if (!(i2s->quirks & QUIRK_NO_MUXPSR)) {

		struct clk *rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC];



		if (rclksrc && !IS_ERR(rclksrc))

			i2s->rclk_srcrate = clk_get_rate(rclksrc);



		psr = i2s->rclk_srcrate / i2s->frmclk / rfs;

		writel(((psr - 1) << 8) | PSR_PSREN, i2s->addr + I2SPSR);

		dev_dbg(&i2s->pdev->dev,

sound/soc/sh/rcar/core.c

+4 −4
Original line number Diff line number Diff line
@@ -1526,14 +1526,14 @@ int rsnd_kctrl_new(struct rsnd_mod *mod, 
	int ret;



	/*

	 * 1) Avoid duplicate register (ex. MIXer case)

	 * 2) re-register if card was rebinded

	 * 1) Avoid duplicate register for DVC with MIX case

	 * 2) Allow duplicate register for MIX

	 * 3) re-register if card was rebinded

	 */

	list_for_each_entry(kctrl, &card->controls, list) {

		struct rsnd_kctrl_cfg *c = kctrl->private_data;



		if (strcmp(kctrl->id.name, name) == 0 &&

		    c->mod == mod)

		if (c == cfg)

			return 0;

	}