path: root/sound
diff options
authorGuido Guenther <agx@sigxcpu.org>2005-11-15 17:28:05 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-16 13:51:50 +1100
commitc0ce5c5228dd17d4e3dd1d15b8d52714262cab70 (patch)
treec4666405c979bd4fb327030416b01fe917259a7f /sound
parentb5166cc252190be80465f3b4f050e4a0310f71af (diff)
[PATCH] PowerBook 6,1: headphone not detected after suspend
ever since suspend to disk works I had the problem that headphone (un)plugging doesn't get detected properly anymore after the first resume. Reloading the module worked around this ever since, however the real cause of the problem was that after a resume the driver only got interrupts on "unplug" not on "plug". Reactivating the headphone status interrupt in tumbler_resume fixes this. This shouldn't cause any trouble with software suspend, but it would be nice if somebody could confirm this: Signed-off-by: Guido Guenther <agx@sigxcpu.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'sound')
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)
if (chip->update_automute)
chip->update_automute(chip, 0);
- if (mix->headphone_irq >= 0)
+ if (mix->headphone_irq >= 0) {
+ unsigned char val;
+ /* activate headphone status interrupts */
+ val = do_gpio_read(&mix->hp_detect);
+ do_gpio_write(&mix->hp_detect, val | 0x80);
+ }
if (mix->lineout_irq >= 0)