summaryrefslogtreecommitdiffstats
path: root/sound/ppc
diff options
context:
space:
mode:
authorRisto Suominen <Risto.Suominen@gmail.com>2008-04-16 13:15:38 +0200
committerTakashi Iwai <tiwai@suse.de>2008-04-24 12:00:38 +0200
commit9a4f20fcbd9cd89d8e4cfcaece81802c19d467ae (patch)
treefe6bd427a1237da8cb2cfe74439ff75601371f4d /sound/ppc
parent369b240d6391aef41d376c9e8769fd939c7c6c4d (diff)
downloadlinux-stable-9a4f20fcbd9cd89d8e4cfcaece81802c19d467ae.tar.gz
linux-stable-9a4f20fcbd9cd89d8e4cfcaece81802c19d467ae.tar.bz2
linux-stable-9a4f20fcbd9cd89d8e4cfcaece81802c19d467ae.zip
[ALSA] snd-powermac: enable headphone detection
Enable port change interrupt while initialising AWACS, Screamer, and Burgundy chipsets. Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc')
-rw-r--r--sound/ppc/pmac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 613a565e04de..6f68ac9982e4 100644
--- a/sound/ppc/pmac.c
+++ b/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