diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-06-26 15:49:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-06-26 15:49:20 +0200 |
| commit | 7e9c2eb62642680e331d91453f94c0073580a1b1 (patch) | |
| tree | 9c81282f509dc28a68c15a03033a0e71dd672912 /sound/pci/hda/patch_hdmi.c | |
| parent | db8e8a9dc97224b016461e596721ebbcfed9c08d (diff) | |
| parent | a07187c992be945ab561b370cbb49cfd72064c3c (diff) | |
| download | op-kernel-dev-7e9c2eb62642680e331d91453f94c0073580a1b1.zip op-kernel-dev-7e9c2eb62642680e331d91453f94c0073580a1b1.tar.gz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
| -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 eab53d7..10b69c8 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2205,7 +2205,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); |
