diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:29 -0400 |
| commit | 02e5fbf622aabf68bdc02282a17a3aeed054237a (patch) | |
| tree | 60f2d4e09464dbf338c832bb39f861f29779b86b /sound/ppc | |
| parent | b759b3ac9aee3afb01c21b603970ebb200c8048e (diff) | |
| parent | bfe9fc8aebc997ce8bcf8ac0586c84a247812064 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/tumbler.c | 2 |
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) | |||
| 1000 | chip->lineout_sw_ctl); | 1000 | chip->lineout_sw_ctl); |
| 1001 | if (mix->anded_reset) | 1001 | if (mix->anded_reset) |
| 1002 | msleep(10); | 1002 | msleep(10); |
| 1003 | check_mute(chip, &mix->amp_mute, 1, mix->auto_mute_notify, | 1003 | check_mute(chip, &mix->amp_mute, !IS_G4DA, mix->auto_mute_notify, |
| 1004 | chip->speaker_sw_ctl); | 1004 | chip->speaker_sw_ctl); |
| 1005 | } else { | 1005 | } else { |
| 1006 | /* unmute speaker, mute others */ | 1006 | /* unmute speaker, mute others */ |