ALSA: hda - Fix left-over merge issues in patch_hdmi.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 3f42cc965b464938c86924b913c77cbcdf5c49a3..1168ebd3fb5c9cfe3bc964b9e223f45f3513c471 100644 (file)
--- 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;