From 4914264af0afc52cc52cb3a06f4a08587db14da9 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 7 Jan 2013 15:07:00 +0100 Subject: [PATCH] --- yaml --- r: 353099 b: refs/heads/master c: cd5be3f9de8945f782e1bbeffd080876eb2aa9f8 h: refs/heads/master i: 353097: a0bdeb367f413afdf7d4c4a9512183dcf740d36c 353095: 16a67a455c8c9c8c5ac8d3309014e74964e9e943 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_generic.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c800b38ccece..1ad0bfaa2413 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5187ac168d6552ca10a95869c1fd33c256e7746a +refs/heads/master: cd5be3f9de8945f782e1bbeffd080876eb2aa9f8 diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c index 11436c115953..1b8fd4d6cae9 100644 --- a/trunk/sound/pci/hda/hda_generic.c +++ b/trunk/sound/pci/hda/hda_generic.c @@ -1138,6 +1138,16 @@ static int fill_and_eval_dacs(struct hda_codec *codec, memset(spec->multiout.extra_out_nid, 0, sizeof(spec->multiout.extra_out_nid)); spec->multi_ios = 0; snd_array_free(&spec->paths); + + /* clear path indices */ + memset(spec->out_paths, 0, sizeof(spec->out_paths)); + memset(spec->hp_paths, 0, sizeof(spec->hp_paths)); + memset(spec->speaker_paths, 0, sizeof(spec->speaker_paths)); + memset(spec->aamix_out_paths, 0, sizeof(spec->aamix_out_paths)); + memset(spec->digout_paths, 0, sizeof(spec->digout_paths)); + memset(spec->loopback_paths, 0, sizeof(spec->loopback_paths)); + memset(&spec->digin_path, 0, sizeof(spec->digin_path)); + badness = 0; /* fill hard-wired DACs first */