summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai2010-09-08 15:28:03 +0200
committerTakashi Iwai2010-09-08 15:28:03 +0200
commiteb7f80c179bfcbf7df99f1de9ec4aa8971b9334d (patch)
tree9331bdb5305e9a3c623017162944d027b4d43a6a /sound/pci
parentALSA: hda - Improve input control names for IDT/STAC codecs (diff)
parentALSA: hda - Fix wrong HP pin detection in snd_hda_parse_pin_def_config() (diff)
downloadkernel-qcow2-linux-eb7f80c179bfcbf7df99f1de9ec4aa8971b9334d.tar.gz
kernel-qcow2-linux-eb7f80c179bfcbf7df99f1de9ec4aa8971b9334d.tar.xz
kernel-qcow2-linux-eb7f80c179bfcbf7df99f1de9ec4aa8971b9334d.zip
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_codec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 72334b7f60e5..2980c277847a 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4555,7 +4555,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
cfg->hp_outs--;
memmove(cfg->hp_pins + i, cfg->hp_pins + i + 1,
sizeof(cfg->hp_pins[0]) * (cfg->hp_outs - i));
- memmove(sequences_hp + i - 1, sequences_hp + i,
+ memmove(sequences_hp + i, sequences_hp + i + 1,
sizeof(sequences_hp[0]) * (cfg->hp_outs - i));
}
}