diff -Naru a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
--- a/sound/ppc/tumbler.c	2005-04-14 03:20:45 -07:00
+++ b/sound/ppc/tumbler.c	2005-04-14 03:20:45 -07:00
@@ -666,6 +666,10 @@
 	pmac_tumbler_t *mix;
 	pmac_gpio_t *gp;
 	int val;
+#ifdef PMAC_SUPPORT_AUTOMUTE
+	if (chip->update_automute && chip->auto_mute)
+		return 0; /* don't touch in the auto-mute mode */
+#endif	
 	if (! (mix = chip->mixer_data))
 		return -ENODEV;
 	gp = (kcontrol->private_value == TUMBLER_MUTE_HP) ? &mix->hp_mute : &mix->amp_mute;
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/01/20 16:39:28+01:00 perex@suse.cz 
#   ALSA CVS update - Takashi Iwai <tiwai@suse.de>
#   PPC Tumbler driver
#   - ignore the manual mute of speaker in the auto-mute mode.
# 
# sound/ppc/tumbler.c
#   2004/01/12 10:55:25+01:00 perex@suse.cz +4 -0
#   ALSA CVS update
#   D:2004/01/12 17:55:25
#   C:PPC Tumbler driver
#   A:Takashi Iwai <tiwai@suse.de>
#   F:ppc/tumbler.c:1.24->1.25 
#   L:- ignore the manual mute of speaker in the auto-mute mode.
#