Merge SCSI misc branch into isci-for-3.6 tag

[firefly-linux-kernel-4.4.55.git] / sound / oss / sb_audio.c

diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
index 75e54f6f638a1d8395195033bede7a19a7106e9c..b2b3c014221afd4d6b2079c6a3627f64fcfe9480 100644 (file)
--- a/sound/oss/sb_audio.c
+++ b/sound/oss/sb_audio.c
@@ -1,5 +1,5 @@
 /*
- * sound/sb_audio.c
+ * sound/oss/sb_audio.c
  *
  * Audio routines for Sound Blaster compatible cards.
  *
@@ -575,13 +575,15 @@ static int jazz16_audio_set_speed(int dev, int speed)
        if (speed > 0)
        {
                int tmp;
-               int s = speed * devc->channels;
+               int s;
 
                if (speed < 5000)
                        speed = 5000;
                if (speed > 44100)
                        speed = 44100;
 
+               s = speed * devc->channels;
+
                devc->tconst = (256 - ((1000000 + s / 2) / s)) & 0xff;
 
                tmp = 256 - devc->tconst;