From 1f34cb7f3134967ec07fa07630c71be65af774ab Mon Sep 17 00:00:00 2001
From: Ondrej Zary <linux@rainbow-software.org>
Date: Mon, 16 Jul 2012 08:30:18 +0200
Subject: [PATCH] --- yaml --- r: 316178 b: refs/heads/master c:
 b4e2a16f992288f1c5cddda1948c53ba3dde9cb3 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/sound/isa/wss/wss_lib.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 037d923778f3..f0dd09140eea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca3273fb594ae4e953042c956eb40141ba46ad2c
+refs/heads/master: b4e2a16f992288f1c5cddda1948c53ba3dde9cb3
diff --git a/trunk/sound/isa/wss/wss_lib.c b/trunk/sound/isa/wss/wss_lib.c
index 00ca9fc4de0a..360b08b03e1d 100644
--- a/trunk/sound/isa/wss/wss_lib.c
+++ b/trunk/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);