Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/sound/core/misc.c b/sound/core/misc.c
index 4ec82aa..03fc711 100644 (file)
--- a/sound/core/misc.c
+++ b/sound/core/misc.c
@@ -23,24 +23,23 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/time.h>
+#include <linux/ioport.h>
 #include <sound/core.h>
 
-int snd_task_name(struct task_struct *task, char *name, size_t size)
+void release_and_free_resource(struct resource *res)
 {
-       unsigned int idx;
-
-       snd_assert(task != NULL && name != NULL && size >= 2, return -EINVAL);
-       for (idx = 0; idx < sizeof(task->comm) && idx + 1 < size; idx++)
-               name[idx] = task->comm[idx];
-       name[idx] = '\0';
-       return 0;
+       if (res) {
+               release_resource(res);
+               kfree(res);
+       }
 }
 
+EXPORT_SYMBOL(release_and_free_resource);
+
 #ifdef CONFIG_SND_VERBOSE_PRINTK
 void snd_verbose_printk(const char *file, int line, const char *format, ...)
 {
        va_list args;
-       char tmpbuf[512];
        
        if (format[0] == '<' && format[1] >= '0' && format[1] <= '9' && format[2] == '>') {
                char tmp[] = "<0>";
@@ -51,17 +50,17 @@ void snd_verbose_printk(const char *file, int line, const char *format, ...)
                printk("ALSA %s:%d: ", file, line);
        }
        va_start(args, format);
-       vsnprintf(tmpbuf, sizeof(tmpbuf), format, args);
+       vprintk(format, args);
        va_end(args);
-       printk(tmpbuf);
 }
+
+EXPORT_SYMBOL(snd_verbose_printk);
 #endif
 
 #if defined(CONFIG_SND_DEBUG) && defined(CONFIG_SND_VERBOSE_PRINTK)
 void snd_verbose_printd(const char *file, int line, const char *format, ...)
 {
        va_list args;
-       char tmpbuf[512];
        
        if (format[0] == '<' && format[1] >= '0' && format[1] <= '9' && format[2] == '>') {
                char tmp[] = "<0>";
@@ -72,9 +71,10 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
                printk(KERN_DEBUG "ALSA %s:%d: ", file, line);
        }
        va_start(args, format);
-       vsnprintf(tmpbuf, sizeof(tmpbuf), format, args);
+       vprintk(format, args);
        va_end(args);
-       printk(tmpbuf);
 
 }
+
+EXPORT_SYMBOL(snd_verbose_printd);
 #endif