diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-08-25 02:52:55 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-08-25 02:52:55 -0400 |
commit | 9dcc144b1f91c4fe33422518e401e9c624e2c64f (patch) | |
tree | d168d6f6ddb6a21326cd7653201e3b243d39175e | |
parent | c4a91e173ac671e81ea6fc9d0951b7527e2ae13d (diff) |
ALSA: hda - Refresh sysfs at snd_hda_codec_update_widgets()
In the commit [fa4f18b4f402: 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>
-rw-r--r-- | sound/pci/hda/hda_codec.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_hdmi.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 792948418cf0..2c021911f88a 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -955,7 +955,7 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec) | |||
955 | hda_nid_t fg; | 955 | hda_nid_t fg; |
956 | int err; | 956 | int err; |
957 | 957 | ||
958 | err = snd_hdac_refresh_widgets(&codec->core); | 958 | err = snd_hdac_refresh_widget_sysfs(&codec->core); |
959 | if (err < 0) | 959 | if (err < 0) |
960 | return err; | 960 | return err; |
961 | 961 | ||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index df982fc6a872..a97db5fc8a15 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
@@ -2331,7 +2331,6 @@ static int patch_generic_hdmi(struct hda_codec *codec) | |||
2331 | if (is_haswell_plus(codec)) { | 2331 | if (is_haswell_plus(codec)) { |
2332 | intel_haswell_enable_all_pins(codec, true); | 2332 | intel_haswell_enable_all_pins(codec, true); |
2333 | intel_haswell_fixup_enable_dp12(codec); | 2333 | intel_haswell_fixup_enable_dp12(codec); |
2334 | snd_hdac_refresh_widget_sysfs(&codec->core); | ||
2335 | } | 2334 | } |
2336 | 2335 | ||
2337 | /* For Valleyview/Cherryview, only the display codec is in the display | 2336 | /* For Valleyview/Cherryview, only the display codec is in the display |