summaryrefslogtreecommitdiffstats
path: root/sound/ppc
diff options
context:
space:
mode:
authorRisto Suominen <Risto.Suominen@gmail.com>2011-04-21 21:54:09 +0300
committerTakashi Iwai <tiwai@suse.de>2011-04-22 13:21:01 +0200
commit30282f96d1eef33be774d4ecf4bddba30a6152ec (patch)
treed45eff4eaf7832626f39b8b792070ab6442896dd /sound/ppc
parente66d74ced12699ed9b7ac62f68b44d842a817ecd (diff)
downloadlinux-stable-30282f96d1eef33be774d4ecf4bddba30a6152ec.tar.gz
linux-stable-30282f96d1eef33be774d4ecf4bddba30a6152ec.tar.bz2
linux-stable-30282f96d1eef33be774d4ecf4bddba30a6152ec.zip
ALSA: powermac - Correct lineout detection on PowerMac G4 DA
Correct lineout (Pro Speaker) detection on PowerMac G4 Digital Audio (Tumbler). Signed-off-by: Risto Suominen <Risto.Suominen@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc')
-rw-r--r--sound/ppc/tumbler.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 961d98297695..9cea84c3e0c6 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1000,7 +1000,7 @@ static void device_change_handler(struct work_struct *work)
chip->lineout_sw_ctl);
if (mix->anded_reset)
msleep(10);
- check_mute(chip, &mix->amp_mute, 1, mix->auto_mute_notify,
+ check_mute(chip, &mix->amp_mute, !IS_G4DA, mix->auto_mute_notify,
chip->speaker_sw_ctl);
} else {
/* unmute speaker, mute others */