Merge branch 'from-linus' into upstream

[linux-2.6-omap-h63xx.git] / sound / oss / sequencer.c

diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index 347cd79c2502aa23b5af9ad62b4f81ce32cfb705..6815c30e0bc1be68fd9589040b167499b5b2cde5 100644 (file)
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -1671,14 +1671,7 @@ void sequencer_init(void)
 
 void sequencer_unload(void)
 {
-       if(queue)
-       {
-               vfree(queue);
-               queue=NULL;
-       }
-       if(iqueue)
-       {
-               vfree(iqueue);
-               iqueue=NULL;
-       }
+       vfree(queue);
+       vfree(iqueue);
+       queue = iqueue = NULL;
 }