X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=sound%2Foss%2Fmsnd.c;h=e4282d93a1aaa121aaac6eeac5c9f22cd92083ec;hb=3b23e665b68387f5ee7b21f7b75ceea4d9acae4a;hp=a7ad2b0a2ac095b768bb6f9ddd7fdf65615b6654;hpb=4060994c3e337b40e0f6fa8ce2cc178e021baf3d;p=linux-2.6

diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c
index a7ad2b0a2a..e4282d93a1 100644
--- a/sound/oss/msnd.c
+++ b/sound/oss/msnd.c
@@ -20,8 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: msnd.c,v 1.17 1999/03/21 16:50:09 andrewtv Exp $
- *
  ********************************************************************/
 
 #include <linux/module.h>
@@ -47,7 +45,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;
 
@@ -95,10 +93,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)