[alsa-devel] [PATCH] Use "Skeaper" instead of "chname" by deafult.

Alexey Fisher bug-track at fisher-privat.net
Sun Dec 6 19:57:24 CET 2009


If you use Speacker by defaut, Surround volume controls will have bad names.
For example:
before patch  ->  after patch
-----------------------------
Speaker       ->  Front
Speaker 1     ->  Surround
Speaker 2     ->  Side

Signed-off-by: Alexey Fisher <bug-track at fisher-privat.net>

	modified:   sound/pci/hda/patch_sigmatel.c
---
 sound/pci/hda/patch_sigmatel.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index e604bae..121a93e 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -3152,13 +3152,13 @@ static int create_multi_out_ctls(struct hda_codec *codec, int num_outs,
 				idx = i;
 				break;
 			case AUTO_PIN_SPEAKER_OUT:
-				name = "Speaker";
-				idx = i;
-				break;
-			default:
 				name = chname[i];
 				idx = 0;
 				break;
+			default:
+				name = "Speaker";
+				idx = i;
+				break;
 			}
 			err = create_controls_idx(codec, name, idx, nid, 3);
 			if (err < 0)
-- 
1.6.3.3



More information about the Alsa-devel mailing list