From ae309a72937ea55b55d4b07288887a78c8e0f262 Mon Sep 17 00:00:00 2001 From: Guido Guenther Date: Tue, 15 Nov 2005 17:28:05 +1100 Subject: [PATCH] --- yaml --- r: 14266 b: refs/heads/master c: c0ce5c5228dd17d4e3dd1d15b8d52714262cab70 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/ppc/tumbler.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7d48bf21205e..3aa2e27503b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5166cc252190be80465f3b4f050e4a0310f71af +refs/heads/master: c0ce5c5228dd17d4e3dd1d15b8d52714262cab70 diff --git a/trunk/sound/ppc/tumbler.c b/trunk/sound/ppc/tumbler.c index 65384afcfc3f..d74bfabe5300 100644 --- a/trunk/sound/ppc/tumbler.c +++ b/trunk/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); }