Merge branch 'master'

[linux-2.6] / sound / core / misc.c

diff --git a/sound/core/misc.c b/sound/core/misc.c
index 11a7675b719b952665d1217d5f8c389fcd301d41..b53e563c09e60d0e16f843bb034d0842df0cc432 100644 (file)
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -23,8 +23,17 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/time.h>
+#include <linux/ioport.h>
 #include <sound/core.h>
 
+void release_and_free_resource(struct resource *res)
+{
+       if (res) {
+               release_resource(res);
+               kfree(res);
+       }
+}
+
 #ifdef CONFIG_SND_VERBOSE_PRINTK
 void snd_verbose_printk(const char *file, int line, const char *format, ...)
 {