Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 3 insertions, 10 deletions

diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index 347cd79c2502..6815c30e0bc1 100644
--- 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;
 }