Commit 286406c2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Pull 5.0 branch for further development of USB-audio quirks

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents b2e9e1c8 e190161f

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/core/pcm_lib.c

+8 −1
Original line number Diff line number Diff line
@@ -2112,6 +2112,13 @@ int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream, 
	return 0;

}



/* allow waiting for a capture stream that hasn't been started */

#if IS_ENABLED(CONFIG_SND_PCM_OSS)

#define wait_capture_start(substream)	((substream)->oss.oss)

#else

#define wait_capture_start(substream)	false

#endif



/* the common loop for read/write data */

snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,

				     void *data, bool interleaved,
@@ -2182,7 +2189,7 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, 
			err = snd_pcm_start(substream);

			if (err < 0)

				goto _end_unlock;

		} else {

		} else if (!wait_capture_start(substream)) {

			/* nothing to do */

			err = 0;

			goto _end_unlock;

sound/pci/cs46xx/dsp_spos.c

+3 −0
Original line number Diff line number Diff line
@@ -903,6 +903,9 @@ int cs46xx_dsp_proc_done (struct snd_cs46xx *chip) 
	struct dsp_spos_instance * ins = chip->dsp_spos_instance;

	int i;



	if (!ins)

		return 0;



	snd_info_free_entry(ins->proc_sym_info_entry);

	ins->proc_sym_info_entry = NULL;

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),