diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-04-28 08:31:31 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-28 08:31:31 +0200 |
commit | 1962fcab4ee80e555bcc9d0f50e416800d474fa2 (patch) | |
tree | 945ba95f11016871f9d5241b7da2712f9367081a /sound/pci/hda/patch_hdmi.c | |
parent | f1a77547c21fe942e95ebaadbc9200f26d138574 (diff) | |
parent | 12e180a27f3e066a4ed4a446d428fd117f168beb (diff) |
Merge branch 'topic/jack' 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 6e7e0b85c3e3..d925742624ee 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2081,7 +2081,7 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx) strncat(hdmi_str, " Phantom", sizeof(hdmi_str) - strlen(hdmi_str) - 1); - return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0); + return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str); } static int generic_hdmi_build_controls(struct hda_codec *codec) |