--- sound/pci/hda/hda_codec.c.orig	2006-08-30 23:36:33.000000000 +0200
+++ sound/pci/hda/hda_codec.c	2006-08-30 23:40:08.000000000 +0200
@@ -1906,15 +1906,6 @@
 						   mout->extra_out_nid[i],
 						   stream_tag, 0, format);
 
-	/* surrounds */
-	for (i = 1; i < mout->num_dacs; i++) {
-		if (chs >= (i + 1) * 2) /* independent out */
-			snd_hda_codec_setup_stream(codec, nids[i], stream_tag, i * 2,
-						   format);
-		else /* copy front */
-			snd_hda_codec_setup_stream(codec, nids[i], stream_tag, 0,
-						   format);
-	}
 	return 0;
 }
 
@@ -1926,10 +1917,9 @@
 	hda_nid_t *nids = mout->dac_nids;
 	int i;
 
-	for (i = 0; i < mout->num_dacs; i++)
-		snd_hda_codec_setup_stream(codec, nids[i], 0, 0, 0);
 	if (mout->hp_nid)
 		snd_hda_codec_setup_stream(codec, mout->hp_nid, 0, 0, 0);
+	snd_hda_codec_setup_stream(codec, nids[HDA_FRONT], 0, 0, 0);
 	for (i = 0; i < ARRAY_SIZE(mout->extra_out_nid); i++)
 		if (mout->extra_out_nid[i])
 			snd_hda_codec_setup_stream(codec,