diff --git a/[refs] b/[refs]
index a26f62bd1006..95a55673b98f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 190006f9d6594ee9ef4775ec09edda7df76fc8f1
+refs/heads/master: 379170a42c84cee5f95fac536a4b5b76843baf90
diff --git a/trunk/sound/oss/sb_audio.c b/trunk/sound/oss/sb_audio.c
index b2b3c014221a..048439a16000 100644
--- a/trunk/sound/oss/sb_audio.c
+++ b/trunk/sound/oss/sb_audio.c
@@ -442,7 +442,7 @@ static int sb201_audio_set_speed(int dev, int speed)
 {
 	sb_devc *devc = audio_devs[dev]->devc;
 	int tmp;
-	int s = speed * devc->channels;
+	int s;
 
 	if (speed > 0)
 	{
@@ -452,6 +452,7 @@ static int sb201_audio_set_speed(int dev, int speed)
 			speed = 44100;
 		if (devc->opened & OPEN_READ && speed > 15000)
 			speed = 15000;
+		s = speed * devc->channels;
 		devc->tconst = (256 - ((1000000 + s / 2) / s)) & 0xff;
 		tmp = 256 - devc->tconst;
 		speed = ((1000000 + tmp / 2) / tmp) / devc->channels;