diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-01-02 13:12:14 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-01-02 13:12:14 -0500 |
| commit | 71a51f80d930faf4b54637f10305e295a05389fc (patch) | |
| tree | 6b2a9ba3c09fb34a40d94c703d09e1f37643b15e /sound/pci/hda/patch_hdmi.c | |
| parent | e88b1c51941d964e77ef7e9099075ae2e8dafd75 (diff) | |
| parent | 095f493c4d532b0ced3aee22e2d5b2cea02aa773 (diff) | |
Merge tag 'v3.10.25' into v3.10-rt
This is the 3.10.25 stable release
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index b93799201578..8c1d1cf0c0cd 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2001,8 +2001,9 @@ static int simple_playback_build_controls(struct hda_codec *codec) int err; per_cvt = get_cvt(spec, 0); - err = snd_hda_create_spdif_out_ctls(codec, per_cvt->cvt_nid, - per_cvt->cvt_nid); + err = snd_hda_create_dig_out_ctls(codec, per_cvt->cvt_nid, + per_cvt->cvt_nid, + HDA_PCM_TYPE_HDMI); if (err < 0) return err; return simple_hdmi_build_jack(codec, 0); |