ALSA: hda - hdmi: call overridden init on resume
authorPierre Ossman <pierre@ossman.eu>
Wed, 18 Jun 2014 19:48:09 +0000 (21:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Jun 2014 10:38:28 +0000 (12:38 +0200)
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>
Cc: <stable@vger.kernel.org> [v3.13+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_hdmi.c

index 3e4417b0ddbe7a1eec6af39d072a993483ae34b4..4fe876b65fdaab4e71dbf965cd6fb1be90fa2229 100644 (file)
@@ -2204,7 +2204,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);