diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-16 20:45:51 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-16 20:45:51 -0500 |
| commit | 556c66db0794b9b85481cb5e3cb57688eabad982 (patch) | |
| tree | 5bc225b790d855aa61ec06abae19e21f6e6b1a82 /sound/ppc/tumbler.c | |
| parent | 3be4bb06b53df2c0a760eeaa5f53448faddedfca (diff) | |
| parent | 8b200abdcf237528a3eb0fe8c680c711fc9824b5 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'sound/ppc/tumbler.c')
| -rw-r--r-- | sound/ppc/tumbler.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 65384afcfc3..d74bfabe530 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -1194,8 +1194,14 @@ static void tumbler_resume(pmac_t *chip) tumbler_set_master_volume(mix); if (chip->update_automute) chip->update_automute(chip, 0); - if (mix->headphone_irq >= 0) + if (mix->headphone_irq >= 0) { + unsigned char val; + enable_irq(mix->headphone_irq); + /* activate headphone status interrupts */ + val = do_gpio_read(&mix->hp_detect); + do_gpio_write(&mix->hp_detect, val | 0x80); + } if (mix->lineout_irq >= 0) enable_irq(mix->lineout_irq); } |