]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ALSA: hda - Clear left-over hp_pins in snd_hda_parse_pin_def_config()
authorTakashi Iwai <tiwai@suse.de>
Wed, 8 Sep 2010 13:28:19 +0000 (15:28 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 8 Sep 2010 13:30:20 +0000 (15:30 +0200)
In snd_hda_parse_def_config(), some unused values may remain in hp_pins[]
array during the headphone-reassignment workaround.  This patch clears
the unused array members.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_codec.c

index 2980c277847a418790e76fc8f28cba46b3e6698c..bfdde7b0bafb8e877b1b48d92046a9441f23a6a2 100644 (file)
@@ -4558,6 +4558,8 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                        memmove(sequences_hp + i, sequences_hp + i + 1,
                                sizeof(sequences_hp[0]) * (cfg->hp_outs - i));
                }
+               memset(cfg->hp_pins + cfg->hp_outs, 0,
+                      sizeof(hda_nid_t) * (AUTO_CFG_MAX_OUTS - cfg->hp_outs));
        }
 
        /* sort by sequence */