summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-08 15:28:19 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-08 15:30:20 +0200
commit03642c9a444079aa13f0864383a8f9ca04bfd198 (patch)
tree3e86ea57e4b4f1e08f928d1731c53c2171807e43 /sound
parenteb7f80c179bfcbf7df99f1de9ec4aa8971b9334d (diff)
downloadop-kernel-dev-03642c9a444079aa13f0864383a8f9ca04bfd198.zip
op-kernel-dev-03642c9a444079aa13f0864383a8f9ca04bfd198.tar.gz
ALSA: hda - Clear left-over hp_pins in snd_hda_parse_pin_def_config()
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_codec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 2980c27..bfdde7b 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -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 */
OpenPOWER on IntegriCloud