Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / isdn / mISDN / tei.c

diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c
index 1b85d9d274965e583a5c972eb7c1a597af879dab..687c9b6264ab027fee9d1ed355239711236f34be 100644 (file)
--- a/drivers/isdn/mISDN/tei.c
+++ b/drivers/isdn/mISDN/tei.c
@@ -79,14 +79,19 @@ static void
 da_debug(struct FsmInst *fi, char *fmt, ...)
 {
        struct manager  *mgr = fi->userdata;
+       struct va_format vaf;
        va_list va;
 
        if (!(*debug & DEBUG_L2_TEIFSM))
                return;
+
        va_start(va, fmt);
-       printk(KERN_DEBUG "mgr(%d): ", mgr->ch.st->dev->id);
-       vprintk(fmt, va);
-       printk("\n");
+
+       vaf.fmt = fmt;
+       vaf.va = &va;
+
+       printk(KERN_DEBUG "mgr(%d): %pV\n", mgr->ch.st->dev->id, &vaf);
+
        va_end(va);
 }
 
@@ -223,14 +228,20 @@ static void
 tei_debug(struct FsmInst *fi, char *fmt, ...)
 {
        struct teimgr   *tm = fi->userdata;
+       struct va_format vaf;
        va_list va;
 
        if (!(*debug & DEBUG_L2_TEIFSM))
                return;
+
        va_start(va, fmt);
-       printk(KERN_DEBUG "sapi(%d) tei(%d): ", tm->l2->sapi, tm->l2->tei);
-       vprintk(fmt, va);
-       printk("\n");
+
+       vaf.fmt = fmt;
+       vaf.va = &va;
+
+       printk(KERN_DEBUG "sapi(%d) tei(%d): %pV\n",
+              tm->l2->sapi, tm->l2->tei, &vaf);
+
        va_end(va);
 }