diff options
author | Pierre Ossman <pierre@ossman.eu> | 2014-06-18 21:48:09 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-06 18:57:29 -0700 |
commit | 22d8ed49fe5a098e09aebfa20070b850f5235fd2 (patch) | |
tree | ada0638fbb1bda32c8f2ce82084aba7f2c077f70 /sound/pci | |
parent | 9ef36a04f57e47715cdad2649daf2fe31d2e50c9 (diff) | |
download | lwn-22d8ed49fe5a098e09aebfa20070b850f5235fd2.tar.gz lwn-22d8ed49fe5a098e09aebfa20070b850f5235fd2.zip |
ALSA: hda - hdmi: call overridden init on resume
commit a283368382c50345dff61525f493ea307f21ec9b upstream.
We need to call the proper init function in case it has been
overridden, as it might restore things that the generic routing
doesn't know anything about. E.g. AMD cards have special verbs
that need resetting.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=77901
Fixes: 5a61358433b1 ('ALSA: hda - hdmi: Add ATI/AMD multi-channel audio support')
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index ce5b339d9333..3abfe2a642ec 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2165,7 +2165,7 @@ static int generic_hdmi_resume(struct hda_codec *codec) struct hdmi_spec *spec = codec->spec; int pin_idx; - generic_hdmi_init(codec); + codec->patch_ops.init(codec); snd_hda_codec_resume_amp(codec); snd_hda_codec_resume_cache(codec); |