VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / sound / oss / sb_audio.c

diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
index 40914dd..75e54f6 100644 (file)
--- a/sound/oss/sb_audio.c
+++ b/sound/oss/sb_audio.c
@@ -519,9 +519,11 @@ static int sbpro_audio_prepare_for_output(int dev, int bsize, int bcount)
                        sb_dsp_command(devc, 0xa0 | bits);      /* Mono output */
                else
                        sb_dsp_command(devc, 0xa8 | bits);      /* Stereo output */
+               spin_unlock_irqrestore(&devc->lock, flags);
        }
        else
        {
+               spin_unlock_irqrestore(&devc->lock, flags);
                tmp = sb_getmixer(devc, 0x0e);
                if (devc->channels == 1)
                        tmp &= ~0x02;
@@ -529,7 +531,6 @@ static int sbpro_audio_prepare_for_output(int dev, int bsize, int bcount)
                        tmp |= 0x02;
                sb_setmixer(devc, 0x0e, tmp);
        }
-       spin_unlock_irqrestore(&devc->lock, flags);
        devc->trigger_bits = 0;
        return 0;
 }