---

yaml --- r: 157816 b: refs/heads/master c: 71443b0 h: refs/heads/master v: v3
git-mirror · Jul 29, 2009 · f0c6e1d · f0c6e1d
1 parent fb9619f
commit f0c6e1d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b4f296fce683497ecc815b2f9b6f121fb3fef8
+refs/heads/master: 71443b0b745f7d2c775c8a228e09ef2dc98d42f3
diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c
@@ -5481,8 +5481,6 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
 		}
 		break;
 	case 0x111d7608: /* 5 Port with Analog Mixer */
-		memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
-		       sizeof(stac92hd71bxx_dmux_amixer));
 		spec->private_dimux.num_items--;
 		switch (spec->board_config) {
 		case STAC_HP_M4:
@@ -5505,9 +5503,15 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
 
 		/* no output amps */
 		spec->num_pwrs = 0;
-		if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1)
+		if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) {
 			spec->mixer = stac92hd71bxx_analog_mixer;
-
+			memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
+			       sizeof(stac92hd71bxx_dmux_amixer));
+		} else {
+			memcpy(&spec->private_dimux,
+			       &stac92hd71bxx_dmux_nomixer,
+			       sizeof(stac92hd71bxx_dmux_nomixer));
+		}
 		/* disable VSW */
 		spec->init = stac92hd71bxx_core_init;
 		unmute_init++;
@@ -5531,10 +5535,15 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
 		spec->num_pwrs = 0;
 		/* fallthru */
 	default:
-		memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
-		       sizeof(stac92hd71bxx_dmux_amixer));
-		if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1)
+		if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) {
 			spec->mixer = stac92hd71bxx_analog_mixer;
+			memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer,
+			       sizeof(stac92hd71bxx_dmux_amixer));
+		} else {
+			memcpy(&spec->private_dimux,
+			       &stac92hd71bxx_dmux_nomixer,
+			       sizeof(stac92hd71bxx_dmux_nomixer));
+		}
 		spec->init = stac92hd71bxx_core_init;
 		codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs;
 		spec->num_dmics = stac92hd71bxx_connected_ports(codec,