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

Commit ffda568e authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

ALSA: hda - Fix subsystem ID read regression 



A regression was introduced in 7639a06c: if AC_PAR_SUBSYSTEM_ID
reads as zero, one should retry using AC_VERB_GET_SUBSYSTEM_ID.

This seems to hit many codecs (my own laptop included), and causes
quirks for some machines not to apply correctly.

Reported-by: default avatarTienFu Chen <tienfu.chen@canonical.com>
Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4738465c

sound/hda/hdac_device.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ int snd_hdac_device_init(struct hdac_device *codec, struct hdac_bus *bus, 




	codec->power_caps = snd_hdac_read_parm(codec, fg, AC_PAR_POWER_STATE);

	codec->power_caps = snd_hdac_read_parm(codec, fg, AC_PAR_POWER_STATE);

	/* reread ssid if not set by parameter */

	/* reread ssid if not set by parameter */

	if (codec->subsystem_id == -1)

	if (codec->subsystem_id == -1 || codec->subsystem_id == 0)

		snd_hdac_read(codec, fg, AC_VERB_GET_SUBSYSTEM_ID, 0,

		snd_hdac_read(codec, fg, AC_VERB_GET_SUBSYSTEM_ID, 0,

			      &codec->subsystem_id);

			      &codec->subsystem_id);