From: Takashi Iwai Date: Tue, 20 Dec 2011 14:53:07 +0000 (+0100) Subject: ALSA: hda - Fix left-over merge issues in patch_hdmi.c X-Git-Tag: MMI-PSA29.97-13-9~16612^2~116^2~12 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=82b1d73f1f22df2c8384cb7cea4aabd9db5273a9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ALSA: hda - Fix left-over merge issues in patch_hdmi.c Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 3f42cc965b46..1168ebd3fb5c 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -805,7 +805,6 @@ static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res) static void hdmi_unsol_event(struct hda_codec *codec, unsigned int res) { - struct hdmi_spec *spec = codec->spec; int tag = res >> AC_UNSOL_RES_TAG_SHIFT; int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT; @@ -1242,7 +1241,6 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx) if (pcmdev > 0) sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev); - hdmi_present_sense(per_pin, 0); return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0); } @@ -1274,7 +1272,7 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) if (err < 0) return err; - hdmi_present_sense(per_pin, false); + hdmi_present_sense(per_pin, 0); } return 0;