X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Foss%2Fmsnd.c;fp=sound%2Foss%2Fmsnd.c;h=a7ad2b0a2ac095b768bb6f9ddd7fdf65615b6654;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=ba38d6200099f883f3f188d6e9255bf07afa80b6;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c
index ba38d6200..a7ad2b0a2 100644
--- a/sound/oss/msnd.c
+++ b/sound/oss/msnd.c
@@ -47,7 +47,7 @@
 static multisound_dev_t		*devs[MSND_MAX_DEVS];
 static int			num_devs;
 
-int msnd_register(multisound_dev_t *dev)
+int __init msnd_register(multisound_dev_t *dev)
 {
 	int i;
 
@@ -95,8 +95,10 @@ void msnd_fifo_init(msnd_fifo *f)
 
 void msnd_fifo_free(msnd_fifo *f)
 {
-	vfree(f->data);
-	f->data = NULL;
+	if (f->data) {
+		vfree(f->data);
+		f->data = NULL;
+	}
 }
 
 int msnd_fifo_alloc(msnd_fifo *f, size_t n)