diff options
-rw-r--r-- | sound/pci/hda/patch_hdmi.c | 4 |
1 files changed, 1 insertions, 3 deletions
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) | |||
805 | 805 | ||
806 | static void hdmi_unsol_event(struct hda_codec *codec, unsigned int res) | 806 | static void hdmi_unsol_event(struct hda_codec *codec, unsigned int res) |
807 | { | 807 | { |
808 | struct hdmi_spec *spec = codec->spec; | ||
809 | int tag = res >> AC_UNSOL_RES_TAG_SHIFT; | 808 | int tag = res >> AC_UNSOL_RES_TAG_SHIFT; |
810 | int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT; | 809 | int subtag = (res & AC_UNSOL_RES_SUBTAG) >> AC_UNSOL_RES_SUBTAG_SHIFT; |
811 | 810 | ||
@@ -1242,7 +1241,6 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx) | |||
1242 | if (pcmdev > 0) | 1241 | if (pcmdev > 0) |
1243 | sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev); | 1242 | sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev); |
1244 | 1243 | ||
1245 | hdmi_present_sense(per_pin, 0); | ||
1246 | return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0); | 1244 | return snd_hda_jack_add_kctl(codec, per_pin->pin_nid, hdmi_str, 0); |
1247 | } | 1245 | } |
1248 | 1246 | ||
@@ -1274,7 +1272,7 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) | |||
1274 | if (err < 0) | 1272 | if (err < 0) |
1275 | return err; | 1273 | return err; |
1276 | 1274 | ||
1277 | hdmi_present_sense(per_pin, false); | 1275 | hdmi_present_sense(per_pin, 0); |
1278 | } | 1276 | } |
1279 | 1277 | ||
1280 | return 0; | 1278 | return 0; |