---

yaml --- r: 14266 b: refs/heads/master c: c0ce5c5 h: refs/heads/master v: v3
git-mirror · Nov 16, 2005 · ae309a7 · ae309a7
1 parent 94088a6
commit ae309a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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);
 }