aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_auto_parser.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-23 10:45:07 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-23 10:45:07 +0100
commit15d47763b354256053c390a9b7bc9f2b4f197711 (patch)
tree6f516e0d3a3d5fb0174d06dfd6db268f4eb5b8ed /sound/pci/hda/hda_auto_parser.c
parentASoC: dapm: Fix _PRE and _POST events for DAPM performance improvements (diff)
parentASoC: omap-mcpdm: Add missing MODULE_ALIAS (diff)
downloadlinux-dev-15d47763b354256053c390a9b7bc9f2b4f197711.tar.xz
linux-dev-15d47763b354256053c390a9b7bc9f2b4f197711.zip
Merge branch 'for-3.5' into for-3.6
Diffstat (limited to 'sound/pci/hda/hda_auto_parser.c')
-rw-r--r--sound/pci/hda/hda_auto_parser.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index 6e9ef3e25093..f7520b9f909c 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -618,7 +618,6 @@ int snd_hda_gen_add_verbs(struct hda_gen_spec *spec,
const struct hda_verb *list)
{
const struct hda_verb **v;
- snd_array_init(&spec->verbs, sizeof(struct hda_verb *), 8);
v = snd_array_new(&spec->verbs);
if (!v)
return -ENOMEM;