aboutsummaryrefslogtreecommitdiff
path: root/sound/isa/wss
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2012-07-16 08:30:18 +0200
committerTakashi Iwai <tiwai@suse.de>2012-07-16 11:24:05 +0200
commitb4e2a16f992288f1c5cddda1948c53ba3dde9cb3 (patch)
treedfc8185f1afcc49f7b83b25bc89898173bfa40be /sound/isa/wss
parentca3273fb594ae4e953042c956eb40141ba46ad2c (diff)
downloadlinux-stericsson-b4e2a16f992288f1c5cddda1948c53ba3dde9cb3.tar.gz
ALSA: wss_lib: Fix resume on Yamaha OPL3-SAx
Yamaha OPL3-SAx chips don't resume properly when playback is running - garbage is played after resume. Restoring the CS4231_PLAYBK_FORMAT register last fixes the problem. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/wss')
-rw-r--r--sound/isa/wss/wss_lib.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 00ca9fc4de0a..360b08b03e1d 100644
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -1656,6 +1656,10 @@ static void snd_wss_resume(struct snd_wss *chip)
break;
}
}
+ /* Yamaha needs this to resume properly */
+ if (chip->hardware == WSS_HW_OPL3SA2)
+ snd_wss_out(chip, CS4231_PLAYBK_FORMAT,
+ chip->image[CS4231_PLAYBK_FORMAT]);
spin_unlock_irqrestore(&chip->reg_lock, flags);
#if 1
snd_wss_mce_down(chip);