Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[karo-tx-linux.git] / sound / oss / msnd.c

diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c
index 4f1ff1bccdcee0a6106ffbd16b206071564c22d6..ba38d6200099f883f3f188d6e9255bf07afa80b6 100644 (file)
--- a/sound/oss/msnd.c
+++ b/sound/oss/msnd.c
@@ -24,7 +24,6 @@
  *
  ********************************************************************/
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -48,7 +47,7 @@
 static multisound_dev_t                *devs[MSND_MAX_DEVS];
 static int                     num_devs;
 
-int __init msnd_register(multisound_dev_t *dev)
+int msnd_register(multisound_dev_t *dev)
 {
        int i;
 
@@ -96,10 +95,8 @@ void msnd_fifo_init(msnd_fifo *f)
 
 void msnd_fifo_free(msnd_fifo *f)
 {
-       if (f->data) {
-               vfree(f->data);
-               f->data = NULL;
-       }
+       vfree(f->data);
+       f->data = NULL;
 }
 
 int msnd_fifo_alloc(msnd_fifo *f, size_t n)