---

yaml --- r: 92222 b: refs/heads/master c: 9a4f20f h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · 4688a89 · 4688a89
1 parent 450d71f
commit 4688a89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 369b240d6391aef41d376c9e8769fd939c7c6c4d
+refs/heads/master: 9a4f20fcbd9cd89d8e4cfcaece81802c19d467ae
diff --git a/trunk/sound/ppc/pmac.c b/trunk/sound/ppc/pmac.c
@@ -1300,9 +1300,9 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
 
 	snd_pmac_sound_feature(chip, 1);
 
-	/* reset */
-	if (chip->model == PMAC_AWACS)
-		out_le32(&chip->awacs->control, 0x11);
+	/* reset & enable interrupts */
+	if (chip->model <= PMAC_BURGUNDY)
+		out_le32(&chip->awacs->control, chip->control_mask);
 
 	/* Powerbooks have odd ways of enabling inputs such as
 	   an expansion-bay CD or sound from an internal modem