Commit 7b48b3b2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents d02cac15 0a5cf9e8

include/sound/compress_driver.h

+5 −1
Original line number Diff line number Diff line
@@ -173,7 +173,11 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) 
	if (snd_BUG_ON(!stream))

		return;



	if (stream->direction == SND_COMPRESS_PLAYBACK)

		stream->runtime->state = SNDRV_PCM_STATE_SETUP;

	else

		stream->runtime->state = SNDRV_PCM_STATE_PREPARED;



	wake_up(&stream->runtime->sleep);

}

include/sound/hda_codec.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct hda_bus { 
	unsigned int response_reset:1;	/* controller was reset */

	unsigned int in_reset:1;	/* during reset operation */

	unsigned int no_response_fallback:1; /* don't fallback at RIRB error */

	unsigned int bus_probing :1;	/* during probing process */



	int primary_dig_out_type;	/* primary digital out PCM type */

	unsigned int mixer_assigned;	/* codec addr for mixer name */

sound/pci/hda/hda_bind.c

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ static int hda_codec_driver_probe(struct device *dev) 
	err = snd_hda_codec_build_controls(codec);

	if (err < 0)

		goto error_module;

	if (codec->card->registered) {

	/* only register after the bus probe finished; otherwise it's racy */

	if (!codec->bus->bus_probing && codec->card->registered) {

		err = snd_card_register(codec->card);

		if (err < 0)

			goto error_module;

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2185,6 +2185,7 @@ static int azx_probe_continue(struct azx *chip) 
	int dev = chip->dev_index;

	int err;



	to_hda_bus(bus)->bus_probing = 1;

	hda->probe_continued = 1;



	/* bind with i915 if needed */
@@ -2269,6 +2270,7 @@ static int azx_probe_continue(struct azx *chip) 
	if (err < 0)

		hda->init_failed = 1;

	complete_all(&hda->probe_wait);

	to_hda_bus(bus)->bus_probing = 0;

	return err;

}

sound/pci/hda/patch_ca0132.c

+3 −1
Original line number Diff line number Diff line
@@ -8451,8 +8451,10 @@ static void ca0132_free(struct hda_codec *codec) 
	ca0132_exit_chip(codec);



	snd_hda_power_down(codec);

	if (IS_ENABLED(CONFIG_PCI) && spec->mem_base)

#ifdef CONFIG_PCI

	if (spec->mem_base)

		pci_iounmap(codec->bus->pci, spec->mem_base);

#endif

	kfree(spec->spec_init_verbs);

	kfree(codec->spec);

}