aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/sequencer.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-28 21:24:50 -0500
committerPaul Mackerras <paulus@samba.org>2006-03-28 21:24:50 -0500
commitbac30d1a78d0f11c613968fc8b351a91ed465386 (patch)
treee52f3c876522a2f6047a6ec1c27df2e8a79486b8 /sound/oss/sequencer.c
parente8222502ee6157e2713da9e0792c21f4ad458d50 (diff)
parentca9ba4471c1203bb6e759b76e83167fec54fe590 (diff)
Merge ../linux-2.6
Diffstat (limited to 'sound/oss/sequencer.c')
-rw-r--r--sound/oss/sequencer.c13
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)
1671 1671
1672void sequencer_unload(void) 1672void sequencer_unload(void)
1673{ 1673{
1674 if(queue) 1674 vfree(queue);
1675 { 1675 vfree(iqueue);
1676 vfree(queue); 1676 queue = iqueue = NULL;
1677 queue=NULL;
1678 }
1679 if(iqueue)
1680 {
1681 vfree(iqueue);
1682 iqueue=NULL;
1683 }
1684} 1677}