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

Commit 9dcc144b authored Aug 25, 2015 by Takashi Iwai

ALSA: hda - Refresh sysfs at snd_hda_codec_update_widgets()



In the commit [fa4f18b4: ALSA: hda - Refresh widgets sysfs at
probing Haswell+ HDMI codecs], snd_hdac_refresh_widget_sysfs() is
explicitly called in the codec driver.  But this results in refreshing
twice, as snd_hdac_refresh_widget_sysfs() itself calls
snd_hdac_refresh_widgets() function.

Instead, we can replace the call in snd_hda_codec_update_widgets()
with snd_hdac_refresh_widget_sysfs().  This also fixes the missing
sysfs update for ca0132, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent c4a91e17

sound/pci/hda/hda_codec.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -955,7 +955,7 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec)
	hda_nid_t fg;		hda_nid_t fg;
	int err;		int err;

	err = snd_hdac_refresh_widgets(&codec->core);		err = snd_hdac_refresh_widget_sysfs(&codec->core);
	if (err < 0)		if (err < 0)
	return err;		return err;

sound/pci/hda/patch_hdmi.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2331,7 +2331,6 @@ static int patch_generic_hdmi(struct hda_codec *codec)
	if (is_haswell_plus(codec)) {		if (is_haswell_plus(codec)) {
	intel_haswell_enable_all_pins(codec, true);		intel_haswell_enable_all_pins(codec, true);
	intel_haswell_fixup_enable_dp12(codec);		intel_haswell_fixup_enable_dp12(codec);
	snd_hdac_refresh_widget_sysfs(&codec->core);
	}		}

	/* For Valleyview/Cherryview, only the display codec is in the display		/* For Valleyview/Cherryview, only the display codec is in the display