From 9384d0abc198e100f70d25ab484d73a8bbb6205f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 20 Dec 2012 14:42:42 +0100 Subject: [PATCH] --- yaml --- r: 353060 b: refs/heads/master c: d94ddd85b1e044c030d62c62f95ae700776888f8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_codec.c | 2 +- trunk/sound/pci/hda/hda_generic.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2bebc8d44290..f2d403da0ec2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ce4886abc61193a8b9dfbb8b08e3f8dff463671 +refs/heads/master: d94ddd85b1e044c030d62c62f95ae700776888f8 diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index 5689393f8da7..f4a0f9d3fd84 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -591,7 +591,7 @@ int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux, return i; if (!recursive) return -1; - if (recursive > 5) { + if (recursive > 10) { snd_printd("hda_codec: too deep connection for 0x%x\n", nid); return -1; } diff --git a/trunk/sound/pci/hda/hda_generic.h b/trunk/sound/pci/hda/hda_generic.h index 417ab65a323e..89ad877e48c8 100644 --- a/trunk/sound/pci/hda/hda_generic.h +++ b/trunk/sound/pci/hda/hda_generic.h @@ -37,7 +37,7 @@ struct hda_multi_io { * vol_ctl and mute_ctl contains the NIDs for the assigned mixers */ -#define MAX_NID_PATH_DEPTH 5 +#define MAX_NID_PATH_DEPTH 10 enum { NID_PATH_VOL_CTL,