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

Commit aa7b9845 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A significant amount of fixes at this time, mostly for covering the
  recent ASoC issues.

   - Fixes for the missing ASoC driver initialization with non-deferred
     probes; these triggered other problems in chain, which resulted in
     yet more fix commits

   - DaVinci runtime PM fix; the diff looks large but it's just a code
     shuffling

   - Various fixes for ASoC Intel drivers: a regression in HD-A HDMI,
     Kconfig dependency, machine driver adjustments, PLL fix.

   - Other ASoC driver-specific stuff including the trivial fixes caught
     by static analysis

   - Usual HD-audio quirks"

* tag 'sound-5.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (30 commits)
  ALSA: hda - Add mute LED support for HP ProBook 470 G5
  ASoC: amd: Fix potential NULL pointer dereference
  ASoC: imx-audmux: change snprintf to scnprintf for possible overflow
  ASoC: rt5514-spi: Fix potential NULL pointer dereference
  ASoC: dapm: change snprintf to scnprintf for possible overflow
  ASoC: rt5682: Fix PLL source register definitions
  ASoC: core: Don't defer probe on optional, NULL components
  ASoC: core: Make snd_soc_find_component() more robust
  ASoC: soc-core: fix init platform memory handling
  ASoC: intel: skl: Fix display power regression
  ALSA: hda/realtek - Fix typo for ALC225 model
  ASoC: soc-core: Hold client_mutex around soc_init_dai_link()
  ASoC: Intel: Boards: move the codec PLL configuration to _init
  ASoC: soc-core: defer card probe until all component is added to list
  ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages
  ASoC: tlv320aic32x4: Kernel OOPS while entering DAPM standby mode
  ASoC: ti: davinci-mcasp: Move context save/restore to runtime_pm callbacks
  ASoC: Variable "val" in function rt274_i2c_probe() could be uninitialized
  ASoC: rt5682: Fix recording no sound issue
  ASoC: Intel: atom: Make PCI dependency explicit
  ...
parents 30bac164 69939038

include/sound/soc.h

+6 −0
Original line number Diff line number Diff line
@@ -985,6 +985,12 @@ struct snd_soc_dai_link { 
	/* Do not create a PCM for this DAI link (Backend link) */

	unsigned int ignore:1;



	/*

	 * This driver uses legacy platform naming. Set by the core, machine

	 * drivers should not modify this value.

	 */

	unsigned int legacy_platform:1;



	struct list_head list; /* DAI link list of the soc card */

	struct snd_soc_dobj dobj; /* For topology */

};

sound/core/compress_offload.c

+2 −1
Original line number Diff line number Diff line
@@ -541,7 +541,8 @@ static int snd_compress_check_input(struct snd_compr_params *params) 
{

	/* first let's check the buffer parameter's */

	if (params->buffer.fragment_size == 0 ||

	    params->buffer.fragments > INT_MAX / params->buffer.fragment_size)

	    params->buffer.fragments > INT_MAX / params->buffer.fragment_size ||

	    params->buffer.fragments == 0)

		return -EINVAL;



	/* now codec parameters */

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -931,6 +931,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x836e, "HP ProBook 455 G5", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x837f, "HP ProBook 470 G5", CXT_FIXUP_MUTE_LED_GPIO),

	SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE),

sound/pci/hda/patch_realtek.c

+1 −1
Original line number Diff line number Diff line
@@ -6926,7 +6926,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC293_FIXUP_LENOVO_SPK_NOISE, .name = "lenovo-spk-noise"},

	{.id = ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, .name = "lenovo-hotkey"},

	{.id = ALC255_FIXUP_DELL_SPK_NOISE, .name = "dell-spk-noise"},

	{.id = ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "alc255-dell1"},

	{.id = ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "alc225-dell1"},

	{.id = ALC295_FIXUP_DISABLE_DAC3, .name = "alc295-disable-dac3"},

	{.id = ALC280_FIXUP_HP_HEADSET_MIC, .name = "alc280-hp-headset"},

	{.id = ALC221_FIXUP_HP_FRONT_MIC, .name = "alc221-hp-mic"},

sound/soc/amd/raven/acp3x-pcm-dma.c

+4 −2
Original line number Diff line number Diff line
@@ -611,14 +611,16 @@ static int acp3x_audio_probe(struct platform_device *pdev) 
	}

	irqflags = *((unsigned int *)(pdev->dev.platform_data));



	adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data),

			     GFP_KERNEL);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n");

			return -ENODEV;

	}



	adata = devm_kzalloc(&pdev->dev, sizeof(*adata), GFP_KERNEL);

	if (!adata)

		return -ENOMEM;



	adata->acp3x_base = devm_ioremap(&pdev->dev, res->start,

					 resource_size(res));