aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-08 09:28:03 -0400
committerTakashi Iwai <tiwai@suse.de>2010-09-08 09:28:03 -0400
commiteb7f80c179bfcbf7df99f1de9ec4aa8971b9334d (patch)
tree9331bdb5305e9a3c623017162944d027b4d43a6a /sound
parent263d0328c46995d8e4fb478005177839104483d2 (diff)
parent122661b67899980f1372812d907e73ebcfb3d037 (diff)
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound')
-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,
4555 cfg->hp_outs--; 4555 cfg->hp_outs--;
4556 memmove(cfg->hp_pins + i, cfg->hp_pins + i + 1, 4556 memmove(cfg->hp_pins + i, cfg->hp_pins + i + 1,
4557 sizeof(cfg->hp_pins[0]) * (cfg->hp_outs - i)); 4557 sizeof(cfg->hp_pins[0]) * (cfg->hp_outs - i));
4558 memmove(sequences_hp + i - 1, sequences_hp + i, 4558 memmove(sequences_hp + i, sequences_hp + i + 1,
4559 sizeof(sequences_hp[0]) * (cfg->hp_outs - i)); 4559 sizeof(sequences_hp[0]) * (cfg->hp_outs - i));
4560 } 4560 }
4561 } 4561 }