---

yaml --- r: 353214 b: refs/heads/master c: 7dddf2a h: refs/heads/master v: v3
git-mirror · Jan 24, 2013 · 8f3f781 · 8f3f781
1 parent 1a4a15a
commit 8f3f781
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5397145f4faeabbb7937ac784f734b06b20ed921
+refs/heads/master: 7dddf2aed8ffc1fa30df92b57981dea146cdfc0f
diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c
@@ -569,7 +569,7 @@ static bool has_amp_out(struct hda_codec *codec, struct nid_path *path, int idx)
 
 /* check whether the given (nid,dir,idx) is active */
 static bool is_active_nid(struct hda_codec *codec, hda_nid_t nid,
-			  unsigned int idx, unsigned int dir)
+			  unsigned int dir, unsigned int idx)
 {
 	struct hda_gen_spec *spec = codec->spec;
 	int i, n;
@@ -642,7 +642,7 @@ static void activate_amp(struct hda_codec *codec, hda_nid_t nid, int dir,
 	unsigned int caps;
 	unsigned int mask, val;
 
-	if (!enable && is_active_nid(codec, nid, dir, idx))
+	if (!enable && is_active_nid(codec, nid, dir, idx_to_check))
 		return;
 
 	caps = query_amp_caps(codec, nid, dir);