Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / sound / oss / msnd.c

diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c
index a7ad2b0a2ac095b768bb6f9ddd7fdf65615b6654..5dbfc0f9c3c7bf32abb87475283ea4c4f21c65b9 100644 (file)
--- a/sound/oss/msnd.c
+++ b/sound/oss/msnd.c
@@ -95,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)