From 109a701246a0c8779696ab3e7e754120ca9bce64 Mon Sep 17 00:00:00 2001 From: Risto Suominen Date: Thu, 21 Apr 2011 21:54:09 +0300 Subject: [PATCH] --- yaml --- r: 248161 b: refs/heads/master c: 30282f96d1eef33be774d4ecf4bddba30a6152ec h: refs/heads/master i: 248159: 6142dff048854db5ec4a7144b12bb74adf70b6ab v: v3 --- [refs] | 2 +- trunk/sound/ppc/tumbler.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2a07622a5363..04158c768008 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e66d74ced12699ed9b7ac62f68b44d842a817ecd +refs/heads/master: 30282f96d1eef33be774d4ecf4bddba30a6152ec diff --git a/trunk/sound/ppc/tumbler.c b/trunk/sound/ppc/tumbler.c index 961d98297695..9cea84c3e0c6 100644 --- a/trunk/sound/ppc/tumbler.c +++ b/trunk/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 */