Skip to content

Commit

Permalink
ALSA: hda - Refresh sysfs at snd_hda_codec_update_widgets()
Browse files Browse the repository at this point in the history
In the commit [fa4f18b: 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>
  • Loading branch information
Takashi Iwai committed Aug 25, 2015
1 parent c4a91e1 commit 9dcc144
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion sound/pci/hda/hda_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec)
hda_nid_t fg;
int err;

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

Expand Down
1 change: 0 additions & 1 deletion sound/pci/hda/patch_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -2331,7 +2331,6 @@ static int patch_generic_hdmi(struct hda_codec *codec)
if (is_haswell_plus(codec)) {
intel_haswell_enable_all_pins(codec, true);
intel_haswell_fixup_enable_dp12(codec);
snd_hdac_refresh_widget_sysfs(&codec->core);
}

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

0 comments on commit 9dcc144

Please sign in to comment.