1 files changed, 4 insertions, 3 deletions

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 5b4dbcec6de8..dbf9910c5269 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -588,6 +588,7 @@ static void cxt_fixup_olpc_xo(struct hda_codec *codec,
                                     const struct hda_fixup *fix, int action)
 {
         struct conexant_spec *spec = codec->spec;
+        struct snd_kcontrol_new *kctl;
         int i;
 
         if (action != HDA_FIXUP_ACT_PROBE)
@@ -606,9 +607,7 @@ static void cxt_fixup_olpc_xo(struct hda_codec *codec,
         snd_hda_codec_set_pin_target(codec, 0x1a, PIN_VREF50);
 
         /* override mic boost control */
-        for (i = 0; i < spec->gen.kctls.used; i++) {
-                struct snd_kcontrol_new *kctl =
-                        snd_array_elem(&spec->gen.kctls, i);
+        snd_array_for_each(&spec->gen.kctls, i, kctl) {
                 if (!strcmp(kctl->name, "Mic Boost Volume")) {
                         kctl->put = olpc_xo_mic_boost_put;
                         break;
@@ -965,6 +964,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
         SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO),
         SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x103c, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),
         SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO),
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),
@@ -998,6 +998,7 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = {
         { .id = CXT_FIXUP_MUTE_LED_EAPD, .name = "mute-led-eapd" },
         { .id = CXT_FIXUP_HP_DOCK, .name = "hp-dock" },
         { .id = CXT_FIXUP_MUTE_LED_GPIO, .name = "mute-led-gpio" },
+        { .id = CXT_FIXUP_HP_MIC_NO_PRESENCE, .name = "hp-mic-fix" },
         {}
 };