From 4688a89790111e27fb6ece5c090a8163ab15bee8 Mon Sep 17 00:00:00 2001 From: Risto Suominen Date: Wed, 16 Apr 2008 13:15:38 +0200 Subject: [PATCH] --- yaml --- r: 92222 b: refs/heads/master c: 9a4f20fcbd9cd89d8e4cfcaece81802c19d467ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/ppc/pmac.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 659b43d4782e..a2f5adf93180 100644 --- 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 index 613a565e04de..6f68ac9982e4 100644 --- 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