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

Commit 2b2b531c authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ALSA: hda: Fix regression on forced probe mask option 



commit 6317f7449348a897483a2b4841f7a9190745c81b upstream.

The forced probe mask via probe_mask 0x100 bit doesn't work any longer
as expected since the bus init code was moved and it's clearing the
codec_mask value that was set beforehand.  This patch fixes the
long-time regression by moving the check_probe_mask() call.

Fixes: a41d1224 ("ALSA: hda - Embed bus into controller object")
Reported-by: default avatar <dmummenschanz@web.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/trinity-f018660b-95c9-442b-a2a8-c92a56eb07ed-1644345967148@3c-app-webde-bap22
Link: https://lore.kernel.org/r/20220214100020.8870-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aca7e5b6

sound/pci/hda/hda_intel.c

+2 −2
Original line number Diff line number Diff line
@@ -1793,8 +1793,6 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, 


	assign_position_fix(chip, check_position_fix(chip, position_fix[dev]));



	check_probe_mask(chip, dev);



	if (single_cmd < 0) /* allow fallback to single_cmd at errors */

		chip->fallback_to_single_cmd = 1;

	else /* explicitly set to single_cmd or not */
@@ -1826,6 +1824,8 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, 
		chip->bus.needs_damn_long_delay = 1;

	}



	check_probe_mask(chip, dev);



	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);

	if (err < 0) {

		dev_err(card->dev, "Error creating device [card]!\n");